Menu
▾
▴
[tcdb-devel] SF.net SVN: tcdb: [272] Website/Includes
|
From: <ro...@us...> - 2006-08-04 19:31:44
|
Revision: 272 Author: rouquin Date: 2006-08-04 12:31:36 -0700 (Fri, 04 Aug 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=272&view=rev Log Message: ----------- Fixed some tree permissions and filter remembering code. Added permissions to trees so that we don't need to add the authentication/permissions check to every page. Modified Paths: -------------- Website/Includes/ActionItems.ascx.cs Website/Includes/AdministrationTree.ascx.cs Website/Includes/Assignments.ascx.cs Website/Includes/AssignmentsTree.ascx.cs Modified: Website/Includes/ActionItems.ascx.cs =================================================================== --- Website/Includes/ActionItems.ascx.cs 2006-08-04 18:54:57 UTC (rev 271) +++ Website/Includes/ActionItems.ascx.cs 2006-08-04 19:31:36 UTC (rev 272) @@ -27,7 +27,6 @@ protected void Page_Load(object sender, EventArgs e) { - if (!m_user.ISAUTHENTICATED) { return; } if (productID == 0) productID = Constants.PRODUCT_SITEID; Modified: Website/Includes/AdministrationTree.ascx.cs =================================================================== --- Website/Includes/AdministrationTree.ascx.cs 2006-08-04 18:54:57 UTC (rev 271) +++ Website/Includes/AdministrationTree.ascx.cs 2006-08-04 19:31:36 UTC (rev 272) @@ -18,6 +18,13 @@ { private static ILog m_logg = LogManager.GetLogger("Page:AdministrationTree"); + protected void Page_Load(object sender, EventArgs e) + { + if (!m_user.ISAUTHENTICATED) { return; } + if (!m_user.HasRight("view_admin", Constants.PRODUCT_ANYID)) + Response.Redirect("~/Assignments.aspx?" + Constants.CODE_USER + "=" + m_user.ID); + } + protected void AdminTree_Init(object sender, EventArgs args) { m_logg.Debug("Initializing admin tree"); @@ -821,4 +828,5 @@ break; } } + } Modified: Website/Includes/Assignments.ascx.cs =================================================================== --- Website/Includes/Assignments.ascx.cs 2006-08-04 18:54:57 UTC (rev 271) +++ Website/Includes/Assignments.ascx.cs 2006-08-04 19:31:36 UTC (rev 272) @@ -138,7 +138,7 @@ if (mode == "created" && ai.CREATOR.ID != m_user.ID) return false; - if (!cboShowActionItems.Checked) + if (cboTypeFilter.Checked && !cboShowActionItems.Checked) return false; } else if (type == Constants.CODE_WO) @@ -162,7 +162,7 @@ if (mode == "created" && wo.CREATOR.ID != m_user.ID) return false; - if (!cboShowWorkOrders.Checked) + if (cboTypeFilter.Checked && !cboShowWorkOrders.Checked) return false; } else @@ -549,7 +549,7 @@ Session["showAICompleted"] = aiStatusList.Items.FindByText("Completed").Selected; } else - aiStatusList.Items.FindByText("Completed").Selected = Convert.ToBoolean(Session["showAIComplete"]); + aiStatusList.Items.FindByText("Completed").Selected = Convert.ToBoolean(Session["showAICompleted"]); if (Session["showAINotStarted"] == null) { aiStatusList.Items.FindByText("Not Started").Selected = m_user.GetConfigBool("filter_show_ai_not_started"); @@ -584,11 +584,11 @@ woStatusList.Items.FindByText("Inactive").Selected = Convert.ToBoolean(Session["showWOInactive"]); if (Session["showWOCompleted"] == null) { - woStatusList.Items.FindByText("Completed").Selected = m_user.GetConfigBool("filter_show_wo_complete"); + woStatusList.Items.FindByText("Completed").Selected = m_user.GetConfigBool("filter_show_wo_completed"); Session["showWOCompleted"] = woStatusList.Items.FindByText("Completed").Selected; } else - woStatusList.Items.FindByText("Completed").Selected = Convert.ToBoolean(Session["showWOComplete"]); + woStatusList.Items.FindByText("Completed").Selected = Convert.ToBoolean(Session["showWOCompleted"]); if (Session["showWONotStarted"] == null) { woStatusList.Items.FindByText("Not Started").Selected = m_user.GetConfigBool("filter_show_wo_not_started"); @@ -606,63 +606,81 @@ protected void toDate_Init(object sender, EventArgs e) { - if (Session["toDate"] == null) + if (!IsPostBack) { - toDate.SelectedDate = m_user.GetConfigDate("filter_show_to_assigned_date"); - Session["toDate"] = toDate.SelectedDate; + if (Session["toDate"] == null) + { + toDate.SelectedDate = m_user.GetConfigDate("filter_show_to_assigned_date"); + Session["toDate"] = toDate.SelectedDate; + } + else + toDate.SelectedDate = Convert.ToDateTime(Session["toDate"]); } - else - toDate.SelectedDate = Convert.ToDateTime(Session["toDate"]); } protected void toDueDate_Init(object sender, EventArgs e) { - if (Session["toDueDate"] == null) + if (!IsPostBack) { - toDueDate.SelectedDate = m_user.GetConfigDate("filter_show_to_due_date"); - Session["toDueDate"] = toDueDate.SelectedDate; + if (Session["toDueDate"] == null) + { + toDueDate.SelectedDate = m_user.GetConfigDate("filter_show_to_due_date"); + Session["toDueDate"] = toDueDate.SelectedDate; + } + else + toDueDate.SelectedDate = Convert.ToDateTime(Session["toDueDate"]); } - else - toDueDate.SelectedDate = Convert.ToDateTime(Session["toDueDate"]); } protected void toFinishedDate_Init(object sender, EventArgs e) { - if (Session["toFinishedDate"] == null) + if (!IsPostBack) { - toFinishedDate.SelectedDate = m_user.GetConfigDate("filter_show_to_finished_dates"); - Session["toFinishedDate"] = toFinishedDate.SelectedDate; + if (Session["toFinishedDate"] == null) + { + toFinishedDate.SelectedDate = m_user.GetConfigDate("filter_show_to_finished_dates"); + Session["toFinishedDate"] = toFinishedDate.SelectedDate; + } + else + toFinishedDate.SelectedDate = Convert.ToDateTime(Session["toFinishedDate"]); } - else - toFinishedDate.SelectedDate = Convert.ToDateTime(Session["toFinishedDate"]); } protected void fromDate_Init(object sender, EventArgs e) { - if (Session["fromDate"] == null) + if (!IsPostBack) { - fromDate.SelectedDate = m_user.GetConfigDate("filter_show_from_assigned_date"); - Session["fromDate"] = fromDate.SelectedDate; + if (Session["fromDate"] == null) + { + fromDate.SelectedDate = m_user.GetConfigDate("filter_show_from_assigned_date"); + Session["fromDate"] = fromDate.SelectedDate; + } + else + fromDate.SelectedDate = Convert.ToDateTime(Session["fromDate"]); } - else - fromDate.SelectedDate = Convert.ToDateTime(Session["fromDate"]); } protected void fromDueDate_Init(object sender, EventArgs e) { - if (Session["fromDueDate"] == null) + if (!IsPostBack) { - fromDueDate.SelectedDate = m_user.GetConfigDate("filter_show_from_due_date"); - Session["fromDueDate"] = fromDueDate.SelectedDate; + if (Session["fromDueDate"] == null) + { + fromDueDate.SelectedDate = m_user.GetConfigDate("filter_show_from_due_date"); + Session["fromDueDate"] = fromDueDate.SelectedDate; + } + else + fromDueDate.SelectedDate = Convert.ToDateTime(Session["fromDueDate"]); } - else - fromDueDate.SelectedDate = Convert.ToDateTime(Session["fromDueDate"]); } protected void fromFinishedDate_Init(object sender, EventArgs e) { - if (Session["fromFinishedDate"] == null) + if (!IsPostBack) { - fromFinishedDate.SelectedDate = m_user.GetConfigDate("filter_show_from_finished_date"); - Session["fromFinishedDate"] = fromFinishedDate.SelectedDate; + if (Session["fromFinishedDate"] == null) + { + fromFinishedDate.SelectedDate = m_user.GetConfigDate("filter_show_from_finished_date"); + Session["fromFinishedDate"] = fromFinishedDate.SelectedDate; + } + else + fromFinishedDate.SelectedDate = Convert.ToDateTime(Session["fromFinishedDate"]); } - else - fromFinishedDate.SelectedDate = Convert.ToDateTime(Session["fromFinishedDate"]); } protected void cboShowActionItems_Init(object sender, EventArgs e) { Modified: Website/Includes/AssignmentsTree.ascx.cs =================================================================== --- Website/Includes/AssignmentsTree.ascx.cs 2006-08-04 18:54:57 UTC (rev 271) +++ Website/Includes/AssignmentsTree.ascx.cs 2006-08-04 19:31:36 UTC (rev 272) @@ -175,16 +175,12 @@ else AssignmentTree_TreeNodePopulate(AssignmentTree, new TreeNodeEventArgs(child)); } - /* TODO: Do we really want to hide the tree? - // If there are no children - if (parent.ChildNodes.Count == 0) - AssignmentTree.Visible = false; - else + + // *************************** + // My assignments node + // *************************** + if (m_user.HasRight("view_my_ai", Constants.PRODUCT_ANYID) || m_user.HasRight("view_my_wo", Constants.PRODUCT_ANYID)) { - */ - // *************************** - // My assignments node - // *************************** TreeNode mine = new TreeNode(); mine.Text = "My Assignments"; mine.Value = Constants.PRODUCT_MINE.ToString(); @@ -195,11 +191,13 @@ parent.ChildNodes.Add(mine); if (nodes.Contains(mine.ValuePath)) mine.Expand(); - + } - // *************************** - // My Created assignments node - // *************************** + // *************************** + // My Created assignments node + // *************************** + if (m_user.HasRight("view_created_ai", Constants.PRODUCT_ANYID) || m_user.HasRight("view_created_wo", Constants.PRODUCT_ANYID)) + { TreeNode created = new TreeNode(); created.Text = "My Created Assignments"; created.Value = Constants.PRODUCT_CREATED.ToString(); @@ -210,21 +208,7 @@ parent.ChildNodes.Add(created); if (nodes.Contains(created.ValuePath)) created.Expand(); - - /* TODO: Do we really want to remove the root node? - } - - // if there's only one - if (parent.ChildNodes.Count == 1) - { - TreeNode root = parent.ChildNodes[0]; - - root.NavigateUrl = "~/Assignments.aspx?" + Constants.CODE_PRODUCT + "=" + root.Value; - AssignmentTree.Nodes[0].Text = ""; - AssignmentTree.ShowExpandCollapse = false; - root.Expand(); - } - */ + } } private void BuildMyUserList(TreeNode parent) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
