michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Users management changes, list of users read only once, ver. 2.18.798

Browse Source
This commit is contained in:
Milan Hanajik 2018-02-01 22:18:48 +01:00
parent 9464e3e4e1
commit c5c4a571c5
8 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TBF/MainWnd.cs
View File

@ -429,7 +429,7 @@ namespace TBF
int len = connStr.ToUpper().IndexOf("; UID=");
if (len > 0) dlg.TitleExtension = connStr.Substring(0, len);
#else
Users.Forms.UserManagementDlg dlg = new Users.Forms.UserManagementDlg(false);
Users.Forms.UserManagementDlg dlg = new Users.Forms.UserManagementDlg(Users.DB.CreateSession(), false);
#endif
dlg.ShowDialog();
}

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.18.797.0")]
[assembly: AssemblyFileVersion("2.18.797.0")]
[assembly: AssemblyVersion("2.18.798.0")]
[assembly: AssemblyFileVersion("2.18.798.0")]

2
UserManagement/Program.cs
View File

@ -128,7 +128,7 @@ namespace UserManagement
try
{
Users.Forms.UserManagementDlg dlg = new Users.Forms.UserManagementDlg(false);
Users.Forms.UserManagementDlg dlg = new Users.Forms.UserManagementDlg(Users.DB.CreateSession(), false);
string connStr = LocalSettings.ConnectionString;
int len = connStr.ToUpper().IndexOf("; UID=");

4
UserManagement/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.18.788.0")]
[assembly: AssemblyFileVersion("2.18.788.0")]
[assembly: AssemblyVersion("2.18.798.0")]
[assembly: AssemblyFileVersion("2.18.798.0")]

14
Users/Forms/EditSelectedUser.cs
View File

@ -128,21 +128,19 @@ namespace Users.Forms
}
session.SaveOrUpdate(user);
transaction.Commit();
session.Flush();
Cursor.Current = Cursors.Default;
return true;
}
catch (Exception exc)
{
transaction.Rollback();
MessageBox.Show(string.Format("{0}{1}{2}", Strings.Save_or_update_user_failed, Environment.NewLine, exc.Message),
Strings.Error, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
}
if (transaction.WasCommitted) session.Flush();
Cursor.Current = Cursors.Default;
return true;
return false;
}
}
/// <summary>
@ -172,12 +170,14 @@ namespace Users.Forms
{
if (Save())
{
DialogResult = DialogResult.OK;
this.Close();
}
}
private void btnCancel_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
this.Close();
}

32
Users/Forms/UserManagementDlg.cs
View File

@ -20,14 +20,15 @@ namespace Users.Forms
IList<User> ListOfUsers;
int LastSelectedIndex;
public UserManagementDlg(bool showLocalExtensions)
public UserManagementDlg(NHibernate.ISession session, bool showLocalExtensions)
{
InitializeComponent();
this.session = session;
this.showExtensions = showLocalExtensions;
if (showLocalExtensions) copyFromRemoteButton.Visible = true;
}
private void EditUsers_Load(object sender, EventArgs e)
private void UserManagementDlg_Load(object sender, EventArgs e)
{
Text = string.Format(string.IsNullOrEmpty(TitleExtension) ? "{0}" : "{0} : {1}", Strings.User_Management, TitleExtension);
addButton.Text = Strings.AddBtnText;
@ -39,23 +40,22 @@ namespace Users.Forms
listViewUsers.Columns.Add(Strings.User_code, 80);
listViewUsers.Columns.Add(Strings.Full_name, 160);
listViewUsers.Columns.Add(Strings.Groups, 300);
}
private void EditUsers_Activated(object sender, EventArgs e)
try
{
Cursor.Current = Cursors.WaitCursor;
session = Users.DB.CreateSession();
ListOfUsers = session.QueryOver<User>().List();
}
catch (Exception exc)
{
string msg = exc.Message;
}
ListUsers();
RefreshButtonStates();
}
public void ListUsers()
{
Cursor.Current = Cursors.WaitCursor;
ListOfUsers = session.QueryOver<User>()
.List();
listViewUsers.Items.Clear();
foreach (User u in ListOfUsers)
{
@ -126,16 +126,24 @@ namespace Users.Forms
private void addButton_Click(object sender, EventArgs e)
{
new Forms.EditSelectedUser(session, new User()).ShowDialog();
User newUser = new User();
if (new Forms.EditSelectedUser(session, newUser).ShowDialog() == DialogResult.OK)
{
ListOfUsers.Add(newUser);
}
ListUsers();
}
private void deleteButton_Click(object sender, EventArgs e)
{
Object Selecteduser = listViewUsers.SelectedItems[0].Tag;
if (listViewUsers.SelectedItems.Count == 1 && listViewUsers.SelectedItems[0].Tag is User)
{
User Selecteduser = listViewUsers.SelectedItems[0].Tag as User;
Users.DB.DeleteObject(session, Selecteduser);
ListOfUsers.Remove(Selecteduser);
ListUsers();
}
}
private void copyFromRemoteButton_Click(object sender, EventArgs e)
{

3
Users/Forms/UserManagementDlg.designer.cs generated
View File

@ -123,8 +123,7 @@ namespace Users.Forms
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.statusStrip1);
this.Name = "UserManagementDlg";
this.Activated += new System.EventHandler(this.EditUsers_Activated);
this.Load += new System.EventHandler(this.EditUsers_Load);
this.Load += new System.EventHandler(this.UserManagementDlg_Load);
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();

4
Users/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.18.788.0")]
[assembly: AssemblyFileVersion("2.18.788.0")]
[assembly: AssemblyVersion("2.18.798.0")]
[assembly: AssemblyFileVersion("2.18.798.0")]