Menu
▾
▴
[tcdb-devel] SF.net SVN: tcdb: [298] Website
|
From: <ro...@us...> - 2006-08-10 17:29:05
|
Revision: 298 Author: rouquin Date: 2006-08-10 09:22:36 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=298&view=rev Log Message: ----------- Modified Paths: -------------- Website/App_Code/Common.cs Website/App_Code/SiteUserControl.cs Website/Includes/ActionItems.ascx.cs Website/Includes/Administration.ascx.cs Website/Includes/AdministrationTree.ascx.cs Website/Includes/Assignments.ascx.cs Website/Includes/AssignmentsTree.ascx.cs Website/Includes/Builds.ascx.cs Website/Includes/FeaturesTree.ascx.cs Website/Includes/Header_Menu.ascx Website/Includes/Header_User.ascx Website/Includes/Platforms.ascx.cs Website/Includes/Products.ascx.cs Website/Includes/Rights.ascx.cs Website/Includes/RoleAdmin.ascx.cs Website/Includes/RoleAssignments.ascx.cs Website/Includes/TestPasses.ascx.cs Website/Includes/UserConfig.ascx.cs Website/Includes/UserRoles.ascx.cs Website/Includes/UserSettings.ascx.cs Property Changed: ---------------- Website/ Property changes on: Website ___________________________________________________________________ Name: svn:ignore - App_Data tcdb2006.log licenses.licx tcdb2006.log.3 tcdb2006.log.1 + App_Data tcdb2006.log licenses.licx tcdb2006.log.3 Modified: Website/App_Code/Common.cs =================================================================== --- Website/App_Code/Common.cs 2006-08-10 15:36:41 UTC (rev 297) +++ Website/App_Code/Common.cs 2006-08-10 16:22:36 UTC (rev 298) @@ -1417,17 +1417,74 @@ public static int ASSIGNMENT_FINISHED = 1; public static int ASSIGNMENT_UNFINISHED = 0; public static int ASSIGNMENT_NEW = 3; + public static string ASSIGNMENT_MINE = "My Assignments"; + public static string ASSIGNMENT_CREATED = "My Created Assignments"; public static string TCDB_VERSION = "1.0.0 Alpha 3"; public static bool IS_DEV_ENV = true; - public static string RIGHTS_ASSIGNPERMISSION = "assignPermission"; - public static string RIGHTS_SITEADMIN = "siteAdmin"; - public static string RIGHTS_ASSIGNASSIGNMENT = "assignAssignment"; + // Rights + public static string RIGHTS_DEV_ACCESS = "dev_access"; + public static string RIGHTS_ADMIN_VIEW = "admin_view"; - public static string ASSIGNMENT_MINE = "My Assignments"; - public static string ASSIGNMENT_CREATED = "My Created Assignments"; + public static string RIGHTS_AI_VIEW_MY = "ai_view_my"; + public static string RIGHTS_AI_VIEW_CREATED = "ai_view_created"; + public static string RIGHTS_AI_VIEW_OTHER = "ai_view_other"; + public static string RIGHTS_AI_EDIT_MY = "ai_edit_my"; + public static string RIGHTS_AI_EDIT_CREATED = "ai_edit_created"; + public static string RIGHTS_AI_EDIT_OTHER = "ai_edit_other"; + public static string RIGHTS_AI_CREATE_MY = "ai_create_my"; + public static string RIGHTS_AI_CREATE_OTHER = "ai_create_other"; + public static string RIGHTS_AI_STATUS_MY = "ai_status_my"; + public static string RIGHTS_AI_STATUS_CREATED = "ai_status_created"; + public static string RIGHTS_AI_STATUS_OTHER = "ai_status_other"; + public static string RIGHTS_AI_DELETE_MY = "ai_delete_my"; + public static string RIGHTS_AI_DELETE_CREATED = "ai_delete_created"; + public static string RIGHTS_AI_DELETE_OTHER = "ai_delete_other"; + public static string RIGHTS_AI_REASSIGN_OTHER = "ai_reassign_other"; + + public static string RIGHTS_WO_VIEW_MY = "wo_view_my"; + public static string RIGHTS_WO_VIEW_CREATED = "wo_view_created"; + public static string RIGHTS_WO_VIEW_OTHER = "wo_view_other"; + public static string RIGHTS_WO_EDIT_MY = "wo_edit_my"; + public static string RIGHTS_WO_EDIT_CREATED = "wo_edit_created"; + public static string RIGHTS_WO_EDIT_OTHER = "wo_edit_other"; + public static string RIGHTS_WO_CREATE_MY = "wo_create_my"; + public static string RIGHTS_WO_CREATE_OTHER = "wo_create_other"; + public static string RIGHTS_WO_STATUS_MY = "wo_status_my"; + public static string RIGHTS_WO_STATUS_CREATED = "wo_status_created"; + public static string RIGHTS_WO_STATUS_OTHER = "wo_status_other"; + public static string RIGHTS_WO_DELETE_MY = "wo_delete_my"; + public static string RIGHTS_WO_DELETE_CREATED = "wo_delete_created"; + public static string RIGHTS_WO_DELETE_OTHER = "wo_delete_other"; + public static string RIGHTS_WO_REASSIGN_OTHER = "wo_reassign_other"; + + public static string RIGHTS_USER_VIEW_MY = "user_view_my"; + public static string RIGHTS_USER_VIEW_OTHER = "user_view_other"; + public static string RIGHTS_USER_EDIT_MY = "user_edit_my"; + public static string RIGHTS_USER_EDIT_OTHER = "user_edit_other"; + public static string RIGHTS_USER_CREATE = "user_create"; + public static string RIGHTS_USER_DELETE = "user_delete"; + + public static string RIGHTS_PREFERENCE_VIEW_MY = "preference_view_my"; + public static string RIGHTS_PREFERENCE_VIEW_OTHER = "preference_view_other"; + public static string RIGHTS_PREFERENCE_EDIT_MY = "preference_edit_my"; + public static string RIGHTS_PREFERENCE_EDIT_OTHER = "preference_edit_other"; + + public static string RIGHTS_ROLE_VIEW_MY = "role_view_my"; + public static string RIGHTS_ROLE_VIEW_OTHER = "role_view_other"; + public static string RIGHTS_ROLE_EDIT = "role_edit"; + public static string RIGHTS_ROLE_EDIT_USERS = "role_edit_users"; + public static string RIGHTS_ROLE_CREATE = "role_create"; + public static string RIGHTS_ROLE_DELETE = "role_delete"; + + public static string RIGHTS_RIGHTS_VIEW = "rights_view"; + + public static string RIGHTS_PRODUCT_VIEW = "product_view"; + public static string RIGHTS_PRODUCT_EDIT = "product_edit"; + public static string RIGHTS_PRODUCT_CREATE = "product_create"; + public static string RIGHTS_PRODUCT_DELETE = "product_delete"; } public static class Help Modified: Website/App_Code/SiteUserControl.cs =================================================================== --- Website/App_Code/SiteUserControl.cs 2006-08-10 15:36:41 UTC (rev 297) +++ Website/App_Code/SiteUserControl.cs 2006-08-10 16:22:36 UTC (rev 298) @@ -51,7 +51,7 @@ m_logg.Debug("Unable to load request start time", ex); } - if (m_user.HasRight("dev_access")) + if (m_user.HasRight(Constants.RIGHTS_DEV_ACCESS)) { m_logg.Debug("User has developer access right, setting 'active' to 'null'"); active = null; Modified: Website/Includes/ActionItems.ascx.cs =================================================================== --- Website/Includes/ActionItems.ascx.cs 2006-08-10 15:36:41 UTC (rev 297) +++ Website/Includes/ActionItems.ascx.cs 2006-08-10 16:22:36 UTC (rev 298) @@ -62,9 +62,9 @@ ai = ActionItemDB.GetActionItem(Convert.ToInt32(item_id), active); if (ai != null && - (!m_user.HasRight("view_other_ai", productID) && - !(ai.ASSIGNED.ID == m_user.ID && m_user.HasRight("view_my_ai", productID)) && - !(ai.CREATOR.ID == m_user.ID && m_user.HasRight("view_created_ai", productID)))) + (!m_user.HasRight(Constants.RIGHTS_AI_VIEW_OTHER, productID) && + !(ai.ASSIGNED.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_VIEW_MY, productID)) && + !(ai.CREATOR.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_VIEW_CREATED, productID)))) Response.Redirect("~/Assignments.aspx?" + Constants.CODE_USER + "=" + m_user.ID); } @@ -72,7 +72,7 @@ Session.Add("productID", productID); Session.Add("tableName", "tcdb_actionItem"); - if (mode == "new" && (m_user.HasRight("create_my_ai") || m_user.HasRight("create_other_ai"))) + if (mode == "new" && (m_user.HasRight(Constants.RIGHTS_AI_CREATE_MY) || m_user.HasRight(Constants.RIGHTS_AI_CREATE_OTHER))) ActionItemsView.ChangeMode(FormViewMode.Insert); } @@ -378,9 +378,9 @@ DropDownList statusList = (DropDownList)sender; if (ai != null && - (!m_user.HasRight("status_other_ai", productID) && - !(ai.ASSIGNED.ID == m_user.ID && m_user.HasRight("status_my_ai", productID)) && - !(ai.CREATOR.ID == m_user.ID && m_user.HasRight("status_created_ai", productID)))) + (!m_user.HasRight(Constants.RIGHTS_AI_STATUS_OTHER, productID) && + !(ai.ASSIGNED.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_STATUS_MY, productID)) && + !(ai.CREATOR.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_STATUS_CREATED, productID)))) statusList.Enabled = false; } protected void percentList_Init(object sender, EventArgs e) @@ -388,9 +388,9 @@ RadioButtonList percentList = (RadioButtonList)sender; if (ai != null && - (!m_user.HasRight("status_other_ai", productID) && - !(ai.ASSIGNED.ID == m_user.ID && m_user.HasRight("status_my_ai", productID)) && - !(ai.CREATOR.ID == m_user.ID && m_user.HasRight("status_created_ai", productID)))) + (!m_user.HasRight(Constants.RIGHTS_AI_STATUS_OTHER, productID) && + !(ai.ASSIGNED.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_STATUS_MY, productID)) && + !(ai.CREATOR.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_STATUS_CREATED, productID)))) percentList.Enabled = false; } protected void dateFinished_Init(object sender, EventArgs e) @@ -398,9 +398,9 @@ CalendarPopup dateFinished = (CalendarPopup)sender; if (ai != null && - (!m_user.HasRight("status_other_ai", productID) && - !(ai.ASSIGNED.ID == m_user.ID && m_user.HasRight("status_my_ai", productID)) && - !(ai.CREATOR.ID == m_user.ID && m_user.HasRight("status_created_ai", productID)))) + (!m_user.HasRight(Constants.RIGHTS_AI_STATUS_OTHER, productID) && + !(ai.ASSIGNED.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_STATUS_MY, productID)) && + !(ai.CREATOR.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_STATUS_CREATED, productID)))) dateFinished.Enabled = false; } protected void NewButton_Init(object sender, EventArgs e) @@ -409,7 +409,7 @@ Label newLbl = (Label)ActionItemsView.FindControl("newLbl"); if (ai != null && - !m_user.HasRight("create_my_ai", Constants.PRODUCT_ANYID) && !m_user.HasRight("create_other_ai", Constants.PRODUCT_ANYID)) + !m_user.HasRight(Constants.RIGHTS_AI_CREATE_MY, Constants.PRODUCT_ANYID) && !m_user.HasRight(Constants.RIGHTS_AI_CREATE_OTHER, Constants.PRODUCT_ANYID)) { newBtn.Visible = false; newLbl.Visible = false; @@ -420,9 +420,9 @@ LinkButton editBtn = (LinkButton)sender; if (ai != null && - !m_user.HasRight("edit_other_ai", productID) && - !(ai.ASSIGNED.ID == m_user.ID && m_user.HasRight("edit_my_ai", productID)) && - !(ai.CREATOR.ID == m_user.ID && m_user.HasRight("edit_created_ai", productID))) + !m_user.HasRight(Constants.RIGHTS_AI_EDIT_OTHER, productID) && + !(ai.ASSIGNED.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_EDIT_MY, productID)) && + !(ai.CREATOR.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_EDIT_CREATED, productID))) editBtn.Visible = false; } protected void DeleteButton_Init(object sender, EventArgs e) @@ -432,9 +432,9 @@ Label deletedLbl = (Label)ActionItemsView.FindControl("deletedLbl"); if (deletedLbl.Visible || (ai != null && - !m_user.HasRight("delete_other_ai", productID) && - !(ai.ASSIGNED.ID == m_user.ID && m_user.HasRight("delete_my_ai", productID)) && - !(ai.CREATOR.ID == m_user.ID && m_user.HasRight("delete_created_ai", productID)))) + !m_user.HasRight(Constants.RIGHTS_AI_DELETE_OTHER, productID) && + !(ai.ASSIGNED.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_DELETE_MY, productID)) && + !(ai.CREATOR.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_DELETE_CREATED, productID)))) { deleteBtn.Visible = false; deleteLbl.Visible = false; @@ -445,8 +445,8 @@ DropDownList assignedTo = (DropDownList)sender; if (ai == null) ai = ActionItemDB.GetActionItem(Convert.ToInt32(item_id), active); - if (!(ActionItemsView.CurrentMode == FormViewMode.Insert && m_user.HasRight("create_other_ai", Constants.PRODUCT_ANYID)) && - !(ActionItemsView.CurrentMode == FormViewMode.Edit && m_user.HasRight("reassign_other_ai", ai.CREATOR, Constants.PRODUCT_ANYID))) + if (!(ActionItemsView.CurrentMode == FormViewMode.Insert && m_user.HasRight(Constants.RIGHTS_AI_CREATE_OTHER, Constants.PRODUCT_ANYID)) && + !(ActionItemsView.CurrentMode == FormViewMode.Edit && m_user.HasRight(Constants.RIGHTS_AI_REASSIGN_OTHER, ai.CREATOR, Constants.PRODUCT_ANYID))) { assignedTo.Enabled = false; if (ActionItemsView.CurrentMode == FormViewMode.Edit) @@ -463,8 +463,8 @@ foreach (Product product in products) { - if ((ActionItemsView.CurrentMode == FormViewMode.Insert && m_user.HasRight("create_other_ai", product.ID)) || - (ActionItemsView.CurrentMode == FormViewMode.Edit && m_user.HasRight("reassign_other_ai", ai.CREATOR, product.ID))) + if ((ActionItemsView.CurrentMode == FormViewMode.Insert && m_user.HasRight(Constants.RIGHTS_AI_CREATE_OTHER, product.ID)) || + (ActionItemsView.CurrentMode == FormViewMode.Edit && m_user.HasRight(Constants.RIGHTS_AI_REASSIGN_OTHER, ai.CREATOR, product.ID))) { tcdbDataSet.db_roleProductUserDataTable rpuTable = rpuAdapter.GetData(null, product.ID, true); @@ -487,7 +487,7 @@ CheckBox activeBox = (CheckBox)sender; Label deletedLbl = (Label)ActionItemsView.FindControl("deletedLbl"); - if (!m_user.HasRight("dev_access")) + if (!m_user.HasRight(Constants.RIGHTS_DEV_ACCESS)) { activeBox.Visible = false; deletedLbl.Visible = false; Modified: Website/Includes/Administration.ascx.cs =================================================================== --- Website/Includes/Administration.ascx.cs 2006-08-10 15:36:41 UTC (rev 297) +++ Website/Includes/Administration.ascx.cs 2006-08-10 16:22:36 UTC (rev 298) @@ -24,17 +24,17 @@ protected void newProduct_Init(object sender, EventArgs e) { - if (!m_user.HasRight("create_product", Constants.PRODUCT_ANYID)) + if (!m_user.HasRight(Constants.RIGHTS_PRODUCT_CREATE, Constants.PRODUCT_ANYID)) newProduct.Visible = false; } protected void newUser_Init(object sender, EventArgs e) { - if (!m_user.HasRight("create_user", Constants.PRODUCT_ANYID)) + if (!m_user.HasRight(Constants.RIGHTS_USER_CREATE, Constants.PRODUCT_ANYID)) newUser.Visible = false; } protected void userRole_Init(object sender, EventArgs e) { - if (!m_user.HasRight("view_my_roles", Constants.PRODUCT_ANYID) && !m_user.HasRight("view_other_roles", Constants.PRODUCT_ANYID)) + if (!m_user.HasRight(Constants.RIGHTS_ROLE_VIEW_MY, Constants.PRODUCT_ANYID) && !m_user.HasRight(Constants.RIGHTS_ROLE_VIEW_OTHER, Constants.PRODUCT_ANYID)) userRole.Visible = false; } @@ -45,7 +45,7 @@ foreach (Product product in products) { - if (!m_user.HasRight("view_product", product.ID)) continue; + if (!m_user.HasRight(Constants.RIGHTS_PRODUCT_VIEW, product.ID)) continue; ListItem item = new ListItem(product.NAME, product.ID.ToString()); if (!product.ACTIVE) @@ -60,15 +60,15 @@ { int productID = Convert.ToInt32(productList.SelectedValue); - if (!m_user.HasRight("view_product", productID)) + if (!m_user.HasRight(Constants.RIGHTS_PRODUCT_VIEW, productID)) viewProduct.Visible = false; else viewProduct.Visible = true; - if (!m_user.HasRight("edit_product", productID)) + if (!m_user.HasRight(Constants.RIGHTS_PRODUCT_EDIT, productID)) editProduct.Visible = false; else editProduct.Visible = true; - if (!m_user.HasRight("delete_product", productID)) + if (!m_user.HasRight(Constants.RIGHTS_PRODUCT_DELETE, productID)) deleteProduct.Visible = false; else deleteProduct.Visible = true; @@ -84,9 +84,9 @@ { foreach (Product product in products) { - if (!(m_user.HasRight("view_other_settings")) && - !(user.ID == m_user.ID && m_user.HasRight("view_my_settings", product.ID)) && - !(m_user.HasRight("view_other_settings", user, product.ID))) + if (!(m_user.HasRight(Constants.RIGHTS_USER_VIEW_OTHER)) && + !(user.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_USER_VIEW_MY, product.ID)) && + !(m_user.HasRight(Constants.RIGHTS_USER_VIEW_OTHER, user, product.ID))) continue; ListItem item = new ListItem(user.FULLNAME, user.ID.ToString()); @@ -112,9 +112,9 @@ userDelete.Visible = false; foreach (Product product in products) { - if (!userView.Visible && m_user.HasRight("view_my_settings", product.ID)) + if (!userView.Visible && m_user.HasRight(Constants.RIGHTS_USER_VIEW_MY, product.ID)) userView.Visible = true; - if (!userEdit.Visible && m_user.HasRight("edit_my_settings", product.ID)) + if (!userEdit.Visible && m_user.HasRight(Constants.RIGHTS_USER_EDIT_MY, product.ID)) userEdit.Visible = true; } } @@ -125,13 +125,13 @@ userDelete.Visible = true; foreach (Product product in products) { - if (!userView.Visible && m_user.HasRight("view_other_settings", user, product.ID)) + if (!userView.Visible && m_user.HasRight(Constants.RIGHTS_USER_VIEW_OTHER, user, product.ID)) userView.Visible = true; - if (!userEdit.Visible && m_user.HasRight("edit_other_settings", user, product.ID)) + if (!userEdit.Visible && m_user.HasRight(Constants.RIGHTS_USER_EDIT_OTHER, user, product.ID)) userEdit.Visible = true; if (product.ID != Constants.PRODUCT_SITEID && user.HasRights(product.ID)) { - if (userDelete.Visible && !m_user.HasRight("delete_user", product.ID)) + if (userDelete.Visible && !m_user.HasRight(Constants.RIGHTS_USER_DELETE, product.ID)) userDelete.Visible = false; } } Modified: Website/Includes/AdministrationTree.ascx.cs =================================================================== --- Website/Includes/AdministrationTree.ascx.cs 2006-08-10 15:36:41 UTC (rev 297) +++ Website/Includes/AdministrationTree.ascx.cs 2006-08-10 16:22:36 UTC (rev 298) @@ -20,7 +20,7 @@ protected void Page_Load(object sender, EventArgs e) { if (!m_user.ISAUTHENTICATED) { return; } - if (this.Visible && !m_user.HasRight("view_admin", Constants.PRODUCT_ANYID)) + if (this.Visible && !m_user.HasRight(Constants.RIGHTS_ADMIN_VIEW, Constants.PRODUCT_ANYID)) Response.Redirect("~/Assignments.aspx?" + Constants.CODE_USER + "=" + m_user.ID); } @@ -52,7 +52,7 @@ foreach (Product product in products) { - if (m_user.HasRight("view_product", product.ID)) + if (m_user.HasRight(Constants.RIGHTS_PRODUCT_VIEW, product.ID)) { // Create the new node. TreeNode newNode = new TreeNode(); @@ -118,7 +118,7 @@ newNode.Expand(); // Rights - if (m_user.HasRight("dev_access")) + if (m_user.HasRight(Constants.RIGHTS_DEV_ACCESS)) { newNode = new TreeNode(); newNode.Text = "User Rights"; @@ -220,7 +220,7 @@ TreeNode newNode; // Versions - if (m_user.HasRight("dev_access")) + if (m_user.HasRight(Constants.RIGHTS_DEV_ACCESS)) { newNode = new TreeNode(); newNode.Text = "Releases"; @@ -369,7 +369,7 @@ else lastID = row.userID; - if (m_user.HasRight("view_other_settings", productID)) + if (m_user.HasRight(Constants.RIGHTS_USER_VIEW_OTHER, productID)) { // Create the new node. TreeNode newNode = new TreeNode(); @@ -391,7 +391,7 @@ foreach (tcdbDataSet.db_usersRow row in uTable) { - if (m_user.HasRight("view_other_settings", productID)) + if (m_user.HasRight(Constants.RIGHTS_USER_VIEW_OTHER, productID)) { TreeNode child = new TreeNode(); child.Text = row.fullName; Modified: Website/Includes/Assignments.ascx.cs =================================================================== --- Website/Includes/Assignments.ascx.cs 2006-08-10 15:36:41 UTC (rev 297) +++ Website/Includes/Assignments.ascx.cs 2006-08-10 16:22:36 UTC (rev 298) @@ -56,8 +56,8 @@ if (uid == 0) { m_logg.Debug("UserID not specified in the session data, checking for permissions to view multiple users assignments"); - if (m_user.HasRight("view_other_ai", productID) || m_user.HasRight("view_created_ai", productID) || - m_user.HasRight("view_other_wo", productID) || m_user.HasRight("view_created_wo", productID)) + if (m_user.HasRight(Constants.RIGHTS_AI_VIEW_OTHER, productID) || m_user.HasRight(Constants.RIGHTS_AI_VIEW_CREATED, productID) || + m_user.HasRight(Constants.RIGHTS_WO_VIEW_OTHER, productID) || m_user.HasRight(Constants.RIGHTS_WO_VIEW_CREATED, productID)) { Product product = ProductDB.GetProduct(true, Convert.ToInt32(productID), null); @@ -72,7 +72,7 @@ } else { - if (m_user.HasRight("view_my_ai") || m_user.HasRight("view_my_wo")) + if (m_user.HasRight(Constants.RIGHTS_AI_VIEW_MY) || m_user.HasRight(Constants.RIGHTS_WO_VIEW_MY)) { m_logg.Debug("User has no special privledges, only display own assignments"); uid = m_user.ID; @@ -85,7 +85,7 @@ } else if (uid == m_user.ID) { - if (m_user.HasRight("view_my_ai") || m_user.HasRight("view_my_wo")) + if (m_user.HasRight(Constants.RIGHTS_AI_VIEW_MY) || m_user.HasRight(Constants.RIGHTS_WO_VIEW_MY)) { m_logg.Debug("The current user's assignments have been requested, only displaying those"); Page.Title = "TCDB: My Assignments"; @@ -99,8 +99,8 @@ User user = UserDB.GetUserInfo(uid); if (user.HasRights(productID) && - (m_user.HasRight("view_other_ai", productID) || m_user.HasRight("view_other_wo", productID) || - m_user.HasRight("view_created_ai", productID) || m_user.HasRight("view_created_wo", productID))) + (m_user.HasRight(Constants.RIGHTS_AI_VIEW_OTHER, productID) || m_user.HasRight(Constants.RIGHTS_WO_VIEW_OTHER, productID) || + m_user.HasRight(Constants.RIGHTS_AI_VIEW_CREATED, productID) || m_user.HasRight(Constants.RIGHTS_WO_VIEW_CREATED, productID))) { String name = user.FULLNAME; m_logg.Debug("User requested assignments for [" + name + "]"); @@ -147,13 +147,13 @@ if (ai.ID != 0 && // It's not mine, the assignee doesn't belong to this product group, or I don't have rights to see other users' Action Items - !(ai.ASSIGNED.ID != m_user.ID && m_user.HasRight("view_other_ai", ai.ASSIGNED, productID)) && + !(ai.ASSIGNED.ID != m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_VIEW_OTHER, ai.ASSIGNED, productID)) && // It's not mine, I don't have any product rights, or I can't view my own - !(ai.ASSIGNED.ID == m_user.ID && m_user.HasRights(productID) && m_user.HasRight("view_my_ai", productID)) && + !(ai.ASSIGNED.ID == m_user.ID && m_user.HasRights(productID) && m_user.HasRight(Constants.RIGHTS_AI_VIEW_MY, productID)) && // It's mine, the assignee doesn't belong to this product group, I didn't create it, or I don't have rights to look at it - !(ai.ASSIGNED.ID != m_user.ID && ai.CREATOR.ID == m_user.ID && m_user.HasRight("view_created_ai", ai.ASSIGNED, productID)) + !(ai.ASSIGNED.ID != m_user.ID && ai.CREATOR.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_VIEW_CREATED, ai.ASSIGNED, productID)) ) return false; @@ -171,13 +171,13 @@ if (wo.ID != 0 && // It's not mine, the assignee doesn't belong to this product group, or I don't have rights to see other users' work orders - !(wo.ASSIGNED.ID != m_user.ID && m_user.HasRight("view_other_wo", wo.ASSIGNED, productID)) && + !(wo.ASSIGNED.ID != m_user.ID && m_user.HasRight(Constants.RIGHTS_WO_VIEW_OTHER, wo.ASSIGNED, productID)) && // It's not mine, I don't have any product rights, or I can't view my own - !(wo.ASSIGNED.ID == m_user.ID && m_user.HasRight("view_my_wo", m_user, productID)) && + !(wo.ASSIGNED.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_WO_VIEW_MY, m_user, productID)) && // It's mine, the assignee doesn't belong to this product group, I didn't create it, or I don't have rights to look at it - !(wo.ASSIGNED.ID != m_user.ID && wo.CREATOR.ID == m_user.ID && m_user.HasRight("view_created_wo", wo.ASSIGNED, productID)) + !(wo.ASSIGNED.ID != m_user.ID && wo.CREATOR.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_WO_VIEW_CREATED, wo.ASSIGNED, productID)) ) return false; @@ -817,14 +817,14 @@ { LinkButton newAI = (LinkButton)sender; - if (!m_user.HasRight("create_my_ai", Constants.PRODUCT_ANYID) && !m_user.HasRight("create_other_ai", Constants.PRODUCT_ANYID)) + if (!m_user.HasRight(Constants.RIGHTS_AI_CREATE_MY, Constants.PRODUCT_ANYID) && !m_user.HasRight(Constants.RIGHTS_AI_CREATE_OTHER, Constants.PRODUCT_ANYID)) newAI.Visible = false; } protected void newWorkOrder_Init(object sender, EventArgs e) { LinkButton newWorkOrder = (LinkButton)sender; - if (!m_user.HasRight("dev_access")) + if (!m_user.HasRight(Constants.RIGHTS_DEV_ACCESS)) newWorkOrder.Visible = false; } protected void newActionItem_Command(object sender, EventArgs e) Modified: Website/Includes/AssignmentsTree.ascx.cs =================================================================== --- Website/Includes/AssignmentsTree.ascx.cs 2006-08-10 15:36:41 UTC (rev 297) +++ Website/Includes/AssignmentsTree.ascx.cs 2006-08-10 16:22:36 UTC (rev 298) @@ -57,8 +57,8 @@ if (Session["AssignmentNodes"] == null) Session.Add("AssignmentNodes", new ArrayList()); - if (!m_user.HasRight("view_other_ai", Constants.PRODUCT_ANYID) && !m_user.HasRight("view_created_ai", Constants.PRODUCT_ANYID) && - !m_user.HasRight("view_other_wo", Constants.PRODUCT_ANYID) && !m_user.HasRight("view_created_wo", Constants.PRODUCT_ANYID)) + if (!m_user.HasRight(Constants.RIGHTS_AI_VIEW_OTHER, Constants.PRODUCT_ANYID) && !m_user.HasRight(Constants.RIGHTS_AI_VIEW_CREATED, Constants.PRODUCT_ANYID) && + !m_user.HasRight(Constants.RIGHTS_WO_VIEW_OTHER, Constants.PRODUCT_ANYID) && !m_user.HasRight(Constants.RIGHTS_WO_VIEW_CREATED, Constants.PRODUCT_ANYID)) { AssignmentTree.Visible = false; } @@ -181,7 +181,7 @@ foreach (Product product in products) { - if (product.ID == Constants.PRODUCT_SITEID && !m_user.HasRight("view_admin")) + if (product.ID == Constants.PRODUCT_SITEID && !m_user.HasRight(Constants.RIGHTS_ADMIN_VIEW)) continue; TreeNode child = new TreeNode(); @@ -203,7 +203,7 @@ // *************************** // My assignments node // *************************** - if (m_user.HasRight("view_my_ai", Constants.PRODUCT_ANYID) || m_user.HasRight("view_my_wo", Constants.PRODUCT_ANYID)) + if (m_user.HasRight(Constants.RIGHTS_AI_VIEW_MY, Constants.PRODUCT_ANYID) || m_user.HasRight(Constants.RIGHTS_WO_VIEW_MY, Constants.PRODUCT_ANYID)) { TreeNode mine = new TreeNode(); SetValue(mine, "NodeType", "User"); @@ -224,7 +224,7 @@ // *************************** // My Created assignments node // *************************** - if (m_user.HasRight("view_created_ai", Constants.PRODUCT_ANYID) || m_user.HasRight("view_created_wo", Constants.PRODUCT_ANYID)) + if (m_user.HasRight(Constants.RIGHTS_AI_VIEW_CREATED, Constants.PRODUCT_ANYID) || m_user.HasRight(Constants.RIGHTS_WO_VIEW_CREATED, Constants.PRODUCT_ANYID)) { TreeNode created = new TreeNode(); SetValue(created, "NodeType", "Created"); @@ -362,9 +362,9 @@ if (a.ISACTIONITEM) { SetValue(child, "NodeType", "ActionItem"); - if ((m_user.HasRight("view_other_ai", productID)) || - ((userID == m_user.ID) && m_user.HasRight("view_my_ai", productID)) || - ((a.ACTIONITEM.CREATOR.ID == m_user.ID) && m_user.HasRight("view_created_ai", productID))) + if ((m_user.HasRight(Constants.RIGHTS_AI_VIEW_OTHER, productID)) || + ((userID == m_user.ID) && m_user.HasRight(Constants.RIGHTS_AI_VIEW_MY, productID)) || + ((a.ACTIONITEM.CREATOR.ID == m_user.ID) && m_user.HasRight(Constants.RIGHTS_AI_VIEW_CREATED, productID))) { SetValue(child, "Value", a.ACTIONITEM.ID.ToString()); } @@ -373,9 +373,9 @@ else { SetValue(child, "NodeType", "WorkOrder"); - if ((m_user.HasRight("view_other_wo", productID)) || - ((userID == m_user.ID) && m_user.HasRight("view_my_ai", productID)) || - ((a.WORKORDER.CREATOR.ID == m_user.ID) && m_user.HasRight("view_created_ai", productID))) + if ((m_user.HasRight(Constants.RIGHTS_WO_VIEW_OTHER, productID)) || + ((userID == m_user.ID) && m_user.HasRight(Constants.RIGHTS_AI_VIEW_MY, productID)) || + ((a.WORKORDER.CREATOR.ID == m_user.ID) && m_user.HasRight(Constants.RIGHTS_AI_VIEW_CREATED, productID))) { SetValue(child, "Value", a.WORKORDER.ID.ToString()); } Modified: Website/Includes/Builds.ascx.cs =================================================================== --- Website/Includes/Builds.ascx.cs 2006-08-10 15:36:41 UTC (rev 297) +++ Website/Includes/Builds.ascx.cs 2006-08-10 16:22:36 UTC (rev 298) @@ -19,7 +19,7 @@ void Page_Load(Object sender, EventArgs e) { - if (!m_user.HasRight("dev_access")) + if (!m_user.HasRight(Constants.RIGHTS_DEV_ACCESS)) Response.Redirect("~/Administration.aspx"); } } Modified: Website/Includes/FeaturesTree.ascx.cs =================================================================== --- Website/Includes/FeaturesTree.ascx.cs 2006-08-10 15:36:41 UTC (rev 297) +++ Website/Includes/FeaturesTree.ascx.cs 2006-08-10 16:22:36 UTC (rev 298) @@ -47,7 +47,7 @@ foreach (Product product in products) { - if (!m_user.HasRight("view_product", product.ID)) + if (!m_user.HasRight(Constants.RIGHTS_PRODUCT_VIEW, product.ID)) continue; // Create the new node. @@ -210,7 +210,7 @@ BuildProductList(e.Node); break; case 1: - if (m_user.HasRight("dev_access")) + if (m_user.HasRight(Constants.RIGHTS_DEV_ACCESS)) BuildVersionList(e.Node); break; case 2: Modified: Website/Includes/Header_Menu.ascx =================================================================== --- Website/Includes/Header_Menu.ascx 2006-08-10 15:36:41 UTC (rev 297) +++ Website/Includes/Header_Menu.ascx 2006-08-10 16:22:36 UTC (rev 298) @@ -4,7 +4,7 @@ <% if (Constants.IS_DEV_ENV) { %> | Execute -<% } if (m_user.HasRight("dev_access")) +<% } if (m_user.HasRight(Constants.RIGHTS_DEV_ACCESS)) { %> | <a href="TestManagement.aspx">Management</a> <% } %> Modified: Website/Includes/Header_User.ascx =================================================================== --- Website/Includes/Header_User.ascx 2006-08-10 15:36:41 UTC (rev 297) +++ Website/Includes/Header_User.ascx 2006-08-10 16:22:36 UTC (rev 298) @@ -2,12 +2,12 @@ <%@ Import Namespace="TCDB.Code" %> Welcome <div class="username"><%= m_user.FIRSTNAME %> <%= m_user.LASTNAME %></div> (<asp:LoginStatus ID="LoginStatus" runat="server" OnLoggingOut="LoginStatus_LoggingOut" CssClass="username" />) -<% if (m_user.HasRight("view_my_settings", Constants.PRODUCT_ANYID)) +<% if (m_user.HasRight(Constants.RIGHTS_USER_VIEW_MY, Constants.PRODUCT_ANYID)) { %> | <a href="UserSettings.aspx?mode=read&<%= Constants.CODE_USER %>=<%= m_user.ID %>" >Settings</a> <% }%> -<% if (m_user.HasRight("view_admin", Constants.PRODUCT_ANYID)) +<% if (m_user.HasRight(Constants.RIGHTS_ADMIN_VIEW, Constants.PRODUCT_ANYID)) { %> | <a href="Administration.aspx">Admin</a> <% } %> \ No newline at end of file Modified: Website/Includes/Platforms.ascx.cs =================================================================== --- Website/Includes/Platforms.ascx.cs 2006-08-10 15:36:41 UTC (rev 297) +++ Website/Includes/Platforms.ascx.cs 2006-08-10 16:22:36 UTC (rev 298) @@ -19,7 +19,7 @@ void Page_Load(Object sender, EventArgs e) { - if (!m_user.HasRight("dev_access")) + if (!m_user.HasRight(Constants.RIGHTS_DEV_ACCESS)) Response.Redirect("~/Administration.aspx"); } } Modified: Website/Includes/Products.ascx.cs =================================================================== --- Website/Includes/Products.ascx.cs 2006-08-10 15:36:41 UTC (rev 297) +++ Website/Includes/Products.ascx.cs 2006-08-10 16:22:36 UTC (rev 298) @@ -40,14 +40,14 @@ productID = Constants.PRODUCT_ANYID; // Insert shortcut - if (mode == "new" && m_user.HasRight("create_product", Constants.PRODUCT_ANYID)) + if (mode == "new" && m_user.HasRight(Constants.RIGHTS_PRODUCT_CREATE, Constants.PRODUCT_ANYID)) ProductsView.ChangeMode(FormViewMode.Insert); - else if (mode == "edit" && m_user.HasRight("edit_product", productID)) + else if (mode == "edit" && m_user.HasRight(Constants.RIGHTS_PRODUCT_EDIT, productID)) ProductsView.ChangeMode(FormViewMode.Edit); else { // Check viewing rights - if (!m_user.HasRight("view_product", productID)) + if (!m_user.HasRight(Constants.RIGHTS_PRODUCT_VIEW, productID)) Response.Redirect("~/TestManagement.aspx"); } @@ -174,7 +174,7 @@ LinkButton newBtn = (LinkButton)sender; Label newLbl = (Label)ProductsView.FindControl("newLbl"); - if (mode == "read" || (!m_user.HasRight("create_product", Constants.PRODUCT_ANYID))) + if (mode == "read" || (!m_user.HasRight(Constants.RIGHTS_PRODUCT_CREATE, Constants.PRODUCT_ANYID))) { newBtn.Visible = false; newLbl.Visible = false; @@ -186,7 +186,7 @@ Label deleteLbl = (Label)ProductsView.FindControl("deleteLbl"); Label activeLbl = (Label)ProductsView.FindControl("activeLbl"); - if (mode == "read" || activeLbl.Visible || (!m_user.HasRight("delete_product",productID))) + if (mode == "read" || activeLbl.Visible || (!m_user.HasRight(Constants.RIGHTS_PRODUCT_DELETE,productID))) { deleteBtn.Visible = false; deleteLbl.Visible = false; @@ -196,7 +196,7 @@ { LinkButton editBtn = (LinkButton)sender; - if (mode == "read" || (!m_user.HasRight("editProduct", productID) && !m_user.HasRight("edit_role_users", productID))) + if (mode == "read" || (!m_user.HasRight("editProduct", productID) && !m_user.HasRight(Constants.RIGHTS_ROLE_EDIT_USERS, productID))) { editBtn.Visible = false; } @@ -212,7 +212,7 @@ Label codeLbl = (Label)ProductsView.FindControl("codeLbl"); Label descriptionLbl = (Label)ProductsView.FindControl("descriptionLbl"); - if (!m_user.HasRight("edit_product", productID)) + if (!m_user.HasRight(Constants.RIGHTS_PRODUCT_EDIT, productID)) { nameBox.Visible = false; codeBox.Visible = false; @@ -229,7 +229,7 @@ CheckBox activeBox = (CheckBox)sender; Label activeLbl = (Label)ProductsView.FindControl("activeLbl"); - if (!m_user.HasRight("dev_access")) + if (!m_user.HasRight(Constants.RIGHTS_DEV_ACCESS)) { activeBox.Visible = false; activeLbl.Visible = false; Modified: Website/Includes/Rights.ascx.cs =================================================================== --- Website/Includes/Rights.ascx.cs 2006-08-10 15:36:41 UTC (rev 297) +++ Website/Includes/Rights.ascx.cs 2006-08-10 16:22:36 UTC (rev 298) @@ -33,16 +33,16 @@ Response.Redirect("~/Administration.aspx"); } } - if (!m_user.HasRight("view_rights", Constants.PRODUCT_ANYID)) + if (!m_user.HasRight(Constants.RIGHTS_RIGHTS_VIEW, Constants.PRODUCT_ANYID)) Response.Redirect("~/Administration.aspx"); Session.Add("rightsID", rightsID); right = RightDB.GetRightInfo(rightsID); Session.Add("tableName", "tcdb_rights"); - if (mode == "new" && m_user.HasRight("dev_access")) + if (mode == "new" && m_user.HasRight(Constants.RIGHTS_DEV_ACCESS)) FormView1.ChangeMode(FormViewMode.Insert); - else if (mode == "edit" && (m_user.HasRight("dev_access") || m_user.HasRight("edit_role", Constants.PRODUCT_ANYID))) + else if (mode == "edit" && (m_user.HasRight(Constants.RIGHTS_DEV_ACCESS) || m_user.HasRight(Constants.RIGHTS_ROLE_EDIT, Constants.PRODUCT_ANYID))) FormView1.ChangeMode(FormViewMode.Edit); } @@ -78,7 +78,7 @@ LinkButton editBtn = (LinkButton)FormView1.FindControl("Edit"); Label newLbl = (Label)FormView1.FindControl("newLbl"); - if (!m_user.HasRight("dev_access")) + if (!m_user.HasRight(Constants.RIGHTS_DEV_ACCESS)) { newBtn.Visible = false; newLbl.Visible = false; @@ -92,7 +92,7 @@ Label nameLbl = (Label)FormView1.FindControl("nameLbl"); Label descriptionLbl = (Label)FormView1.FindControl("descriptionLbl"); - if (!m_user.HasRight("dev_access")) + if (!m_user.HasRight(Constants.RIGHTS_DEV_ACCESS)) { nameBox.Visible = false; descriptionBox.Visible = false; @@ -106,7 +106,7 @@ CheckBox activeBox = (CheckBox)sender; Label activeLbl = (Label)FormView1.FindControl("activeLbl"); - if (!m_user.HasRight("dev_access")) + if (!m_user.HasRight(Constants.RIGHTS_DEV_ACCESS)) { activeBox.Visible = false; activeLbl.Visible = false; Modified: Website/Includes/RoleAdmin.ascx.cs =================================================================== --- Website/Includes/RoleAdmin.ascx.cs 2006-08-10 15:36:41 UTC (rev 297) +++ Website/Includes/RoleAdmin.ascx.cs 2006-08-10 16:22:36 UTC (rev 298) @@ -53,12 +53,12 @@ protected void newRole_Init(object sender, EventArgs e) { - if (!m_user.HasRight("create_role", Constants.PRODUCT_ANYID)) + if (!m_user.HasRight(Constants.RIGHTS_ROLE_CREATE, Constants.PRODUCT_ANYID)) newRoleBtn.Visible = false; } protected void newRight_Init(object sender, EventArgs e) { - if (!m_user.HasRight("dev_access")) + if (!m_user.HasRight(Constants.RIGHTS_DEV_ACCESS)) newRightBtn.Visible = false; } @@ -78,7 +78,7 @@ } protected void rightsList_Init(object sender, EventArgs e) { - if (!m_user.HasRight("view_rights", Constants.PRODUCT_ANYID)) + if (!m_user.HasRight(Constants.RIGHTS_RIGHTS_VIEW, Constants.PRODUCT_ANYID)) { rightsList.Visible = false; viewRightBtn.Visible = false; @@ -86,7 +86,7 @@ return; } - if (!m_user.HasRight("dev_access")) + if (!m_user.HasRight(Constants.RIGHTS_DEV_ACCESS)) editRightsBtn.Visible = false; List<Right> rights = RightDB.TCDB_GetRightList(active); @@ -105,15 +105,15 @@ { String role = roleList.SelectedItem.Text; - if (!m_user.HasRight("edit_role_users", productID)) + if (!m_user.HasRight(Constants.RIGHTS_ROLE_EDIT_USERS, productID)) addRoleBtn.Visible = false; } protected void viewRoleBtn_Load(object sender, EventArgs e) { String role = roleList.SelectedItem.Text; - if (!(m_user.HasRole(role, productID) && m_user.HasRight("view_my_roles", productID)) && - !m_user.HasRight("view_other_roles", productID)) + if (!(m_user.HasRole(role, productID) && m_user.HasRight(Constants.RIGHTS_ROLE_VIEW_MY, productID)) && + !m_user.HasRight(Constants.RIGHTS_ROLE_VIEW_OTHER, productID)) viewRoleBtn.Visible = false; } } Modified: Website/Includes/RoleAssignments.ascx.cs =================================================================== --- Website/Includes/RoleAssignments.ascx.cs 2006-08-10 15:36:41 UTC (rev 297) +++ Website/Includes/RoleAssignments.ascx.cs 2006-08-10 16:22:36 UTC (rev 298) @@ -31,7 +31,7 @@ role = RightDB.GetRoleInfo(roleID); // Check rights - if (!m_user.HasRight("edit_role_users",Constants.PRODUCT_ANYID)) + if (!m_user.HasRight(Constants.RIGHTS_ROLE_EDIT_USERS,Constants.PRODUCT_ANYID)) Response.Redirect("~/Administration.aspx"); roleNameBtn.Text = role.NAME; @@ -104,11 +104,11 @@ { List<Product> products = ProductDB.GetProductList(active); foreach (Product product in products) - if (m_user.HasRight("edit_role_users", product.ID)) + if (m_user.HasRight(Constants.RIGHTS_ROLE_EDIT_USERS, product.ID)) productList.Items.Add(new ListItem(product.NAME, product.ID.ToString())); // Set selected value - if (productList.Items.FindByValue(productID.ToString()) != null && m_user.HasRight("edit_role_users", productID)) + if (productList.Items.FindByValue(productID.ToString()) != null && m_user.HasRight(Constants.RIGHTS_ROLE_EDIT_USERS, productID)) productList.SelectedValue = productID.ToString(); Session["product"] = productList.SelectedValue; Modified: Website/Includes/TestPasses.ascx.cs =================================================================== --- Website/Includes/TestPasses.ascx.cs 2006-08-10 15:36:41 UTC (rev 297) +++ Website/Includes/TestPasses.ascx.cs 2006-08-10 16:22:36 UTC (rev 298) @@ -19,7 +19,7 @@ void Page_Load(Object sender, EventArgs e) { - if (!m_user.HasRight("dev_access")) + if (!m_user.HasRight(Constants.RIGHTS_DEV_ACCESS)) Response.Redirect("~/Administration.aspx"); } } Modified: Website/Includes/UserConfig.ascx.cs =================================================================== --- Website/Includes/UserConfig.ascx.cs 2006-08-10 15:36:41 UTC (rev 297) +++ Website/Includes/UserConfig.ascx.cs 2006-08-10 16:22:36 UTC (rev 298) @@ -25,7 +25,7 @@ { if (!m_user.ISAUTHENTICATED) { return; } - if (!m_user.HasRight("view_my_preferences", Constants.PRODUCT_ANYID)) + if (!m_user.HasRight(Constants.RIGHTS_PREFERENCE_VIEW_MY, Constants.PRODUCT_ANYID)) Response.Redirect("~/UserSettings.aspx?" + Constants.CODE_USER + "=" + m_user.ID); m_logg.Debug("Loading page UserConfig"); @@ -34,7 +34,7 @@ m_logg.Debug("Unable to locate user ID in query string. Default to current user"); userID = m_user.ID; } - bool enabled = m_user.HasRight("edit_my_preferences", Constants.PRODUCT_ANYID); + bool enabled = m_user.HasRight(Constants.RIGHTS_PREFERENCE_EDIT_MY, Constants.PRODUCT_ANYID); Dictionary<String, List<Config>> settings = ConfigDB.GetUserSettings(); Modified: Website/Includes/UserRoles.ascx.cs =================================================================== --- Website/Includes/UserRoles.ascx.cs 2006-08-10 15:36:41 UTC (rev 297) +++ Website/Includes/UserRoles.ascx.cs 2006-08-10 16:22:36 UTC (rev 298) @@ -40,16 +40,16 @@ Session.Add("roleID", roleID); // Check rights - if (!(m_user.HasRole(role.NAME) && m_user.HasRight("view_my_roles", Constants.PRODUCT_ANYID)) && - !m_user.HasRight("view_other_roles", Constants.PRODUCT_ANYID)) + if (!(m_user.HasRole(role.NAME) && m_user.HasRight(Constants.RIGHTS_ROLE_VIEW_MY, Constants.PRODUCT_ANYID)) && + !m_user.HasRight(Constants.RIGHTS_ROLE_VIEW_OTHER, Constants.PRODUCT_ANYID)) Response.Redirect("~/Administration.aspx"); // Setup notes //Session.Add("tableName", "tcdb_role"); - if (mode == "new" && m_user.HasRight("create_role", Constants.PRODUCT_ANYID)) + if (mode == "new" && m_user.HasRight(Constants.RIGHTS_ROLE_CREATE, Constants.PRODUCT_ANYID)) UserRoleView.ChangeMode(FormViewMode.Insert); - else if (mode == "edit" && (m_user.HasRight("edit_role", Constants.PRODUCT_ANYID) || m_user.HasRight("edit_role_users", Constants.PRODUCT_ANYID))) + else if (mode == "edit" && (m_user.HasRight(Constants.RIGHTS_ROLE_EDIT, Constants.PRODUCT_ANYID) || m_user.HasRight(Constants.RIGHTS_ROLE_EDIT_USERS, Constants.PRODUCT_ANYID))) UserRoleView.ChangeMode(FormViewMode.Edit); } @@ -185,7 +185,7 @@ { LinkButton btn = (LinkButton)sender; - if (!m_user.HasRight("dev_access")) + if (!m_user.HasRight(Constants.RIGHTS_DEV_ACCESS)) btn.Visible = false; } @@ -194,7 +194,7 @@ LinkButton newBtn = (LinkButton)sender; Label newLbl = (Label)UserRoleView.FindControl("NewLbl"); - if (!m_user.HasRight("create_role", Constants.PRODUCT_ANYID)) + if (!m_user.HasRight(Constants.RIGHTS_ROLE_CREATE, Constants.PRODUCT_ANYID)) { newBtn.Visible = false; newLbl.Visible = false; @@ -206,7 +206,7 @@ LinkButton editBtn = (LinkButton)sender; Label editLbl = (Label)UserRoleView.FindControl("NewLbl"); - if (!m_user.HasRight("edit_role", Constants.PRODUCT_ANYID) && !m_user.HasRight("edit_role_users", Constants.PRODUCT_ANYID)) + if (!m_user.HasRight(Constants.RIGHTS_ROLE_EDIT, Constants.PRODUCT_ANYID) && !m_user.HasRight(Constants.RIGHTS_ROLE_EDIT_USERS, Constants.PRODUCT_ANYID)) { editBtn.Visible = false; editLbl.Visible = false; @@ -225,12 +225,12 @@ foreach (int productID in ProductUsers.Keys) { - if (activeLbl.Visible == true || ((ProductUsers[productID].Count > 0) && !m_user.HasRight("delete_role", productID))) + if (activeLbl.Visible == true || ((ProductUsers[productID].Count > 0) && !m_user.HasRight(Constants.RIGHTS_ROLE_DELETE, productID))) { deleteBtn.Visible = false; deleteLbl.Visible = false; } - if ((ProductUsers[productID].Count > 0) && !m_user.HasRight("edit_role", productID)) + if ((ProductUsers[productID].Count > 0) && !m_user.HasRight(Constants.RIGHTS_ROLE_EDIT, productID)) { editBtn.Visible = false; newLbl.Visible = false; @@ -243,7 +243,7 @@ CheckBox activeBox = (CheckBox)sender; Label activeLbl = (Label)UserRoleView.FindControl("ActiveLbl"); - if (!m_user.HasRight("dev_access")) + if (!m_user.HasRight(Constants.RIGHTS_DEV_ACCESS)) { activeBox.Visible = false; activeLbl.Visible = false; Modified: Website/Includes/UserSettings.ascx.cs =================================================================== --- Website/Includes/UserSettings.ascx.cs 2006-08-10 15:36:41 UTC (rev 297) +++ Website/Includes/UserSettings.ascx.cs 2006-08-10 16:22:36 UTC (rev 298) @@ -41,9 +41,9 @@ // Rights check if (mode == "read" && userID != m_user.ID) Response.Redirect("~/UserSettings.aspx?" + Constants.CODE_USER + "=" + m_user.ID); - if (userID == m_user.ID && !m_user.HasRight("view_my_settings", productID)) + if (userID == m_user.ID && !m_user.HasRight(Constants.RIGHTS_USER_VIEW_MY, productID)) Response.Redirect("~/Assignments.aspx?" + Constants.CODE_USER + "=" + m_user.ID); - if (userID != m_user.ID && !(m_user.HasRight("view_other_settings", user, productID))) + if (userID != m_user.ID && !(m_user.HasRight(Constants.RIGHTS_USER_VIEW_OTHER, user, productID))) Response.Redirect("~/UserSettings.aspx?" + Constants.CODE_USER + "=" + m_user.ID); // Settings init @@ -51,10 +51,10 @@ Session.Add("userID", userID); Session.Add("tableName", "tcdb_user"); - if (mode == "new" && m_user.HasRight("create_user", Constants.PRODUCT_ANYID)) + if (mode == "new" && m_user.HasRight(Constants.RIGHTS_USER_CREATE, Constants.PRODUCT_ANYID)) UserSettingsView.ChangeMode(FormViewMode.Insert); else if (mode == "edit" && ((user.ID==m_user.ID && - m_user.HasRight("edit_my_settings",productID)) || (m_user.HasRight("edit_other_settings", user, productID)))) + m_user.HasRight(Constants.RIGHTS_USER_EDIT_MY,productID)) || (m_user.HasRight(Constants.RIGHTS_USER_EDIT_OTHER, user, productID)))) UserSettingsView.ChangeMode(FormViewMode.Edit); } @@ -67,7 +67,7 @@ if ((mode == "read") || (userID == m_user.ID) || !user.HasRights(productID) || - !m_user.HasRight("delete_user", productID)) + !m_user.HasRight(Constants.RIGHTS_USER_DELETE, productID)) deleteButton.Visible = false; } protected void deleteLabel_Load(object sender, EventArgs e) @@ -78,7 +78,7 @@ if ((mode == "read") || (userID == m_user.ID) || !user.HasRights(productID) || - !m_user.HasRight("delete_user", productID)) + !m_user.HasRight(Constants.RIGHTS_USER_DELETE, productID)) deleteLabel.Visible = false; } protected void newButton_Load(object sender, EventArgs e) @@ -88,7 +88,7 @@ if ((mode == "read") || !user.HasRights(productID) || - !m_user.HasRight("create_user", Constants.PRODUCT_ANYID)) + !m_user.HasRight(Constants.RIGHTS_USER_CREATE, Constants.PRODUCT_ANYID)) newButton.Visible = false; } protected void newLabel_Load(object sender, EventArgs e) @@ -98,7 +98,7 @@ if ((mode == "read") || !user.HasRights(productID) || - !m_user.HasRight("create_user", Constants.PRODUCT_ANYID)) + !m_user.HasRight(Constants.RIGHTS_USER_CREATE, Constants.PRODUCT_ANYID)) newLabel.Visible = false; } protected void Edit_Init(object sender, EventArgs e) @@ -106,8 +106,8 @@ LinkButton editBtn = (LinkButton)sender; if (user == null) user = UserDB.GetUserInfo(userID); - if (!(userID == m_user.ID && m_user.HasRight("edit_my_settings", Constants.PRODUCT_ANYID)) && - !(userID != m_user.ID && user.HasRights(productID) && m_user.HasRight("edit_other_settings", productID))) + if (!(userID == m_user.ID && m_user.HasRight(Constants.RIGHTS_USER_EDIT_MY, Constants.PRODUCT_ANYID)) && + !(userID != m_user.ID && user.HasRights(productID) && m_user.HasRight(Constants.RIGHTS_USER_EDIT_OTHER, productID))) editBtn.Visible = false; } protected void editConfig_Init(object sender, EventArgs e) @@ -115,8 +115,8 @@ LinkButton editConfigBtn = (LinkButton)sender; if (user == null) user = UserDB.GetUserInfo(userID); - if (!(userID == m_user.ID && m_user.HasRight("view_my_preferences", Constants.PRODUCT_ANYID)) && - !(userID != m_user.ID && user.HasRights(productID) && m_user.HasRight("view_other_preferences", productID))) + if (!(userID == m_user.ID && m_user.HasRight(Constants.RIGHTS_PREFERENCE_VIEW_MY, Constants.PRODUCT_ANYID)) && + !(userID != m_user.ID && user.HasRights(productID) && m_user.HasRight(Constants.RIGHTS_PREFERENCE_VIEW_OTHER, productID))) editConfigBtn.Visible = false; } protected void editLabel_Load(object sender, EventArgs e) @@ -124,8 +124,8 @@ Label editLabel = (Label)sender; if (user == null) user = UserDB.GetUserInfo(userID); - if (!(userID == m_user.ID && m_user.HasRight("view_my_preferences", Constants.PRODUCT_ANYID)) && - !(userID != m_user.ID && user.HasRights(productID) && m_user.HasRight("view_other_preferences", productID))) + if (!(userID == m_user.ID && m_user.HasRight(Constants.RIGHTS_PREFERENCE_VIEW_MY, Constants.PRODUCT_ANYID)) && + !(userID != m_user.ID && user.HasRights(productID) && m_user.HasRight(Constants.RIGHTS_PREFERENCE_VIEW_OTHER, productID))) editLabel.Visible = false; } @@ -293,8 +293,8 @@ { Literal roleTree = (Literal)sender; - if ((userID == m_user.ID && m_user.HasRight("view_my_roles", Constants.PRODUCT_ANYID)) || - (userID != m_user.ID && m_user.HasRight("view_other_roles", Constants.PRODUCT_ANYID))) + if ((userID == m_user.ID && m_user.HasRight(Constants.RIGHTS_ROLE_VIEW_MY, Constants.PRODUCT_ANYID)) || + (userID != m_user.ID && m_user.HasRight(Constants.RIGHTS_ROLE_VIEW_OTHER, Constants.PRODUCT_ANYID))) { roleTree.Visible = true; roleTree.ID = "roleTree"; @@ -311,8 +311,8 @@ foreach (Product product in products) { - if ((userID == m_user.ID && m_user.HasRight("view_my_roles", product.ID)) || - (userID != m_user.ID && m_user.HasRight("view_other_roles", product.ID))) + if ((userID == m_user.ID && m_user.HasRight(Constants.RIGHTS_ROLE_VIEW_MY, product.ID)) || + (userID != m_user.ID && m_user.HasRight(Constants.RIGHTS_ROLE_VIEW_OTHER, product.ID))) { // Get Roles tcdbDataSetTableAdapters.db_roleUserProductTableAdapter rupAdapter = new tcdbDataSetTableAdapters.db_roleUserProductTableAdapter(); @@ -352,7 +352,7 @@ TreeView roleTree = (TreeView)sender; // Only display the rights tree if the user has permissions to access this - if (!m_user.HasRight("view_my_roles", Constants.PRODUCT_ANYID)) + if (!m_user.HasRight(Constants.RIGHTS_ROLE_VIEW_MY, Constants.PRODUCT_ANYID)) roleTree.Visible = false; if (!m_user.HasRight("edit_my_roles", Constants.PRODUCT_ANYID)) @@ -388,7 +388,7 @@ foreach (Product product in products) { - if (m_user.HasRight("edit_role_users", product.ID)) + if (m_user.HasRight(Constants.RIGHTS_ROLE_EDIT_USERS, product.ID)) { TreeNode child = new TreeNode(); child.Text = "<label>" + product.NAME + "</label>"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
