Compare commits
4 Commits
B2026-003_
...
C2026-006
| Author | SHA1 | Date | |
|---|---|---|---|
| c76808e11e | |||
| b2428a4211 | |||
| aa0e919713 | |||
| 7e2a41b6cb |
@@ -145,6 +145,9 @@ namespace VEPROMS
|
|||||||
}
|
}
|
||||||
|
|
||||||
LoadRefreshGroupUsers();
|
LoadRefreshGroupUsers();
|
||||||
|
|
||||||
|
// C2026-004 - messagebox when create group
|
||||||
|
MessageBox.Show($"{txt} group successfully created.", "Create group", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||||
}
|
}
|
||||||
private void tvFolders_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
|
private void tvFolders_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
|
||||||
{
|
{
|
||||||
@@ -187,18 +190,22 @@ namespace VEPROMS
|
|||||||
//Add a Member to a Group
|
//Add a Member to a Group
|
||||||
private void addMember_Click(object sender, EventArgs e)
|
private void addMember_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
int groupIndex = cbGroupSelection.SelectedIndex;
|
// B2026-007 PROMS Security - don't error when add a user to a group but no group selected
|
||||||
string selectedUserID = lstNonMembers.SelectedValue.ToString();
|
if (lstNonMembers.SelectedValue != null)
|
||||||
int selectedUID = UserInfo.GetByUserID(selectedUserID).UID;
|
{
|
||||||
GroupInfo gi = myGroupInfoList[groupIndex];
|
int groupIndex = cbGroupSelection.SelectedIndex;
|
||||||
User selectedUser = User.Get(selectedUID);
|
string selectedUserID = lstNonMembers.SelectedValue.ToString();
|
||||||
|
int selectedUID = UserInfo.GetByUserID(selectedUserID).UID;
|
||||||
|
GroupInfo gi = myGroupInfoList[groupIndex];
|
||||||
|
User selectedUser = User.Get(selectedUID);
|
||||||
|
|
||||||
Membership.MakeMembership(selectedUser, Group.Get(gi.GID), null, "");
|
Membership.MakeMembership(selectedUser, Group.Get(gi.GID), null, "");
|
||||||
updateMembershipLists();
|
updateMembershipLists();
|
||||||
lstNonMembers.SelectedIndex = -1;
|
lstNonMembers.SelectedIndex = -1;
|
||||||
|
|
||||||
int index = lstMembers.FindString(selectedUserID);
|
int index = lstMembers.FindString(selectedUserID);
|
||||||
lstMembers.SetSelected(index, true);
|
lstMembers.SetSelected(index, true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//Remove a Member From a Group
|
//Remove a Member From a Group
|
||||||
@@ -326,6 +333,7 @@ namespace VEPROMS
|
|||||||
User u = User.MakeUser("[Enter New UserID]", "", "", "", "", "", "", "", "", "", "", DateTime.Now, "");
|
User u = User.MakeUser("[Enter New UserID]", "", "", "", "", "", "", "", "", "", "", DateTime.Now, "");
|
||||||
frmManageUser frm = new frmManageUser("add");
|
frmManageUser frm = new frmManageUser("add");
|
||||||
frm.MyUser = u;
|
frm.MyUser = u;
|
||||||
|
frm.Text = "Enter New UserID"; //C2026-002 Change Title bar on Add/Edit User
|
||||||
if (frm.ShowDialog(this) == DialogResult.OK)
|
if (frm.ShowDialog(this) == DialogResult.OK)
|
||||||
{
|
{
|
||||||
u = frm.MyUser;
|
u = frm.MyUser;
|
||||||
|
|||||||
@@ -20,7 +20,27 @@ namespace VEPROMS
|
|||||||
_MyUser = value;
|
_MyUser = value;
|
||||||
SimpleUser su = new SimpleUser(_MyUser);
|
SimpleUser su = new SimpleUser(_MyUser);
|
||||||
pgUser.SelectedObject = su;
|
pgUser.SelectedObject = su;
|
||||||
this.Text = string.Format("{0} ({1} {2}) Information",su.UserID,su.FirstName,su.LastName);
|
|
||||||
|
//C2026-002 Change Title bar on Add/Edit User
|
||||||
|
string tmp;
|
||||||
|
if (!string.IsNullOrEmpty(su.FirstName) && !string.IsNullOrEmpty(su.LastName))
|
||||||
|
{
|
||||||
|
tmp = $"{su.UserID} ({su.FirstName} {su.LastName}) Information";
|
||||||
|
}
|
||||||
|
else if (!string.IsNullOrEmpty(su.LastName))
|
||||||
|
{
|
||||||
|
tmp = $"{su.UserID} ({su.LastName}) Information";
|
||||||
|
}
|
||||||
|
else if (!string.IsNullOrEmpty(su.FirstName))
|
||||||
|
{
|
||||||
|
tmp = $"{su.UserID} ({su.FirstName}) Information";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
tmp = $"{su.UserID} Information";
|
||||||
|
}
|
||||||
|
|
||||||
|
this.Text = tmp;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private string _Mode;
|
private string _Mode;
|
||||||
|
|||||||
Reference in New Issue
Block a user