Menu
▾
▴
[tcdb-devel] SF.net SVN: tcdb: [282] Website/Includes
|
From: <ro...@us...> - 2006-08-08 19:12:13
|
Revision: 282 Author: rouquin Date: 2006-08-08 12:11:55 -0700 (Tue, 08 Aug 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=282&view=rev Log Message: ----------- Fixed some more bugs. Remove delete button if active box is available. Product page schema update. Modified Paths: -------------- Website/Includes/ActionItems.ascx Website/Includes/ActionItems.ascx.cs Website/Includes/Products.ascx Website/Includes/Products.ascx.cs Website/Includes/Rights.ascx Website/Includes/Rights.ascx.cs Website/Includes/RoleAdmin.ascx.cs Website/Includes/Roles.ascx.cs Modified: Website/Includes/ActionItems.ascx =================================================================== --- Website/Includes/ActionItems.ascx 2006-08-08 18:39:41 UTC (rev 281) +++ Website/Includes/ActionItems.ascx 2006-08-08 19:11:55 UTC (rev 282) @@ -70,8 +70,8 @@ <asp:Label ID="nameLbl" runat="server" Text='<%# Eval("name") %>' ToolTip='<%# Eval("name") %>'></asp:Label></h2> </div> <div class="bottom"> - <asp:Label ID="tpLbl" runat="server" Visible="false">Test Pass:</asp:Label><asp:Label ID="testPassLbl" - runat="server" Text='<%# Eval("testPass") %>' Visible="false"></asp:Label> + <asp:Label ID="tpLbl" runat="server" Visible="false">Test Pass:</asp:Label><asp:Label + ID="testPassLbl" runat="server" Text='<%# Eval("testPass") %>' Visible="false"></asp:Label> </div> </div> <div class="right"> @@ -104,8 +104,9 @@ <div class="left"> <div class="bottom"> <asp:LinkButton ID="NewButton" runat="server" CausesValidation="False" CommandName="New" - Text="New" OnInit="NewButton_Init" /> | <asp:LinkButton ID="EditButton" - runat="server" CausesValidation="False" CommandName="Edit" Text="Edit" OnInit="EditButton_Init" /> | <asp:LinkButton + Text="New" OnInit="NewButton_Init" /><asp:Label ID="newLbl" runat="server"> | </asp:Label><asp:LinkButton + ID="EditButton" runat="server" CausesValidation="False" CommandName="Edit" Text="Edit" + OnInit="EditButton_Init" /><asp:Label ID="deleteLbl" runat="server"> | </asp:Label><asp:LinkButton ID="DeleteButton" runat="server" CausesValidation="False" CommandName="deleteItem" Text="Delete" OnCommand="deleteItem" OnInit="DeleteButton_Init" /> </div> @@ -255,7 +256,8 @@ <asp:Label ID="tpLbl" runat="server" Visible="false"> Test Pass:</asp:Label> <asp:DropDownList ID="testPassList" runat="server" AppendDataBoundItems="True" DataSourceID="TestPassDataSource" - DataTextField="name" DataValueField="testPassID" SelectedValue='<%# Bind("testPassID") %>' Visible="false"> + DataTextField="name" DataValueField="testPassID" SelectedValue='<%# Bind("testPassID") %>' + Visible="false"> <asp:ListItem Value="0" Selected="True"><none></asp:ListItem> </asp:DropDownList></div> </div> Modified: Website/Includes/ActionItems.ascx.cs =================================================================== --- Website/Includes/ActionItems.ascx.cs 2006-08-08 18:39:41 UTC (rev 281) +++ Website/Includes/ActionItems.ascx.cs 2006-08-08 19:11:55 UTC (rev 282) @@ -389,10 +389,14 @@ protected void NewButton_Init(object sender, EventArgs e) { LinkButton newBtn = (LinkButton)sender; + Label newLbl = (Label)ActionItemsView.FindControl("newLbl"); - if (ai != null && + if (ai != null && !m_user.HasRight("create_my_ai", Constants.PRODUCT_ANYID) && !m_user.HasRight("create_other_ai", Constants.PRODUCT_ANYID)) + { newBtn.Visible = false; + newLbl.Visible = false; + } } protected void EditButton_Init(object sender, EventArgs e) { @@ -407,12 +411,17 @@ protected void DeleteButton_Init(object sender, EventArgs e) { LinkButton deleteBtn = (LinkButton)sender; + Label deleteLbl = (Label)ActionItemsView.FindControl("deleteLbl"); + Label deletedLbl = (Label)ActionItemsView.FindControl("deletedLbl"); - if (ai != null && + 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))) + !(ai.CREATOR.ID == m_user.ID && m_user.HasRight("delete_created_ai", productID)))) + { deleteBtn.Visible = false; + deleteLbl.Visible = false; + } } protected void assignedTo_Init(object sender, EventArgs e) { Modified: Website/Includes/Products.ascx =================================================================== --- Website/Includes/Products.ascx 2006-08-08 18:39:41 UTC (rev 281) +++ Website/Includes/Products.ascx 2006-08-08 19:11:55 UTC (rev 282) @@ -211,7 +211,7 @@ </FooterTemplate> </asp:FormView> <asp:ObjectDataSource ID="ProductData" runat="server" InsertMethod="Insert" SelectMethod="GetData" - TypeName="tcdbDataSetTableAdapters.db_productsTableAdapter" UpdateMethod="Update"> + TypeName="tcdbDataSetTableAdapters.db_productsTableAdapter" UpdateMethod="Update" OldValuesParameterFormatString="original_{0}"> <UpdateParameters> <asp:Parameter Name="productID" Type="Int32" /> <asp:Parameter Name="name" Type="String" /> @@ -227,6 +227,7 @@ <SelectParameters> <asp:SessionParameter DefaultValue="" Name="active" SessionField="active" Type="Boolean" /> <asp:SessionParameter Name="productID" SessionField="productID" Type="Int32" /> + <asp:Parameter Name="productName" Type="String" /> </SelectParameters> <InsertParameters> <asp:Parameter Name="name" Type="String" /> Modified: Website/Includes/Products.ascx.cs =================================================================== --- Website/Includes/Products.ascx.cs 2006-08-08 18:39:41 UTC (rev 281) +++ Website/Includes/Products.ascx.cs 2006-08-08 19:11:55 UTC (rev 282) @@ -182,8 +182,9 @@ { LinkButton deleteBtn = (LinkButton)sender; Label deleteLbl = (Label)ProductsView.FindControl("deleteLbl"); + Label activeLbl = (Label)ProductsView.FindControl("activeLbl"); - if (mode == "read" || (!m_user.HasRight("delete_product",productID))) + if (mode == "read" || activeLbl.Visible || (!m_user.HasRight("delete_product",productID))) { deleteBtn.Visible = false; deleteLbl.Visible = false; Modified: Website/Includes/Rights.ascx =================================================================== --- Website/Includes/Rights.ascx 2006-08-08 18:39:41 UTC (rev 281) +++ Website/Includes/Rights.ascx 2006-08-08 19:11:55 UTC (rev 282) @@ -59,9 +59,7 @@ <td align="left" colspan="6"> <asp:LinkButton ID="New" runat="server" CommandName="new" OnInit="New_Init">New</asp:LinkButton><asp:Label ID="newLbl" runat="server" Text="Label"> | </asp:Label><asp:LinkButton - ID="Edit" runat="server" CommandName="edit">Edit</asp:LinkButton><asp:Label ID="deleteLbl" - runat="server" Text="Label"> | </asp:Label><asp:LinkButton ID="Delete" - runat="server" CommandName="deleteCmd" OnCommand="deleteCmd">Delete</asp:LinkButton></td> + ID="Edit" runat="server" CommandName="edit">Edit</asp:LinkButton></td> </tr> </table> </div> @@ -105,22 +103,6 @@ </td> </tr> <tr> - <td align="left" colspan="2" valign="top" width="33%"> - <strong>Roles:<br /> - </strong> <asp:ListBox ID="roleList" runat="server" OnDataBound="roleList_DataBound" - DataSourceID="RolesDataSource" DataTextField="roleName" DataValueField="roleID" - SelectionMode="Multiple" Height="150px" Width="150px"></asp:ListBox> - </td> - <td align="left" colspan="2" valign="top" width="33%"> - </td> - <td align="left" colspan="2" valign="top" width="34%"> - </td> - </tr> - <tr> - <td class="hr" colspan="6"> - </td> - </tr> - <tr> <td align="left" colspan="6"> <asp:LinkButton ID="UpdateButton" runat="server" CausesValidation="True" CommandName="Update" Text="Update"> @@ -171,22 +153,6 @@ </td> </tr> <tr> - <td align="left" colspan="2" valign="top" width="33%"> - <strong>Roles:<br /> - </strong> <asp:ListBox ID="roleList" runat="server" OnDataBound="roleList_DataBound" - DataSourceID="RolesDataSource" DataTextField="roleName" DataValueField="roleID" - SelectionMode="Multiple"></asp:ListBox> - </td> - <td align="left" colspan="2" valign="top" width="33%"> - </td> - <td align="left" colspan="2" valign="top" width="34%"> - </td> - </tr> - <tr> - <td class="hr" colspan="6"> - </td> - </tr> - <tr> <td align="left" colspan="6"> <asp:LinkButton ID="InsertButton" runat="server" CausesValidation="True" CommandName="Insert" Text="Insert"></asp:LinkButton> Modified: Website/Includes/Rights.ascx.cs =================================================================== --- Website/Includes/Rights.ascx.cs 2006-08-08 18:39:41 UTC (rev 281) +++ Website/Includes/Rights.ascx.cs 2006-08-08 19:11:55 UTC (rev 282) @@ -48,22 +48,6 @@ FormView1.ChangeMode(FormViewMode.Edit); } - protected void updateRoles() - { - ListBox roleList = (ListBox)FormView1.FindControl("roleList"); - - // there is a more efficient way of doing this, but no one wants it - tcdbDataSetTableAdapters.db_roleRightTableAdapter rrAdapter = new tcdbDataSetTableAdapters.db_roleRightTableAdapter(); - foreach (ListItem item in roleList.Items) - { - int roleID = Convert.ToInt32(item.Value); - - if (item.Selected) - rrAdapter.InsertRoleRights(roleID, rightsID); - else - rrAdapter.DeleteRoleRights(roleID, rightsID); - } - } protected void FormView1_ItemInserted(object sender, FormViewInsertedEventArgs e) { Right right = RightDB.GetRightInfo(null, e.Values["rightsName"].ToString(), e.Values["rightsCode"].ToString(), true); @@ -72,7 +56,6 @@ { rightsID = right.ID; - updateRoles(); Response.Redirect("~/Right.aspx?" + Constants.CODE_RIGHT + "=" + rightsID); } else @@ -81,16 +64,8 @@ Response.Redirect("~/Administration.aspx"); } } - protected void deleteCmd(object sender, CommandEventArgs e) - { - tcdbDataSetTableAdapters.db_rightsTableAdapter rAdapter = new tcdbDataSetTableAdapters.db_rightsTableAdapter(); - rAdapter.Update(rightsID, right.CODE, right.NAME, right.DESCRIPTION, false); - - Response.Redirect("~/Administration.aspx"); - } protected void FormView1_ItemUpdated(object sender, FormViewUpdatedEventArgs e) { - updateRoles(); Response.Redirect("~/Right.aspx?"+Constants.CODE_RIGHT+"="+rightsID); } protected void FormView1_ItemCommand(object sender, FormViewCommandEventArgs e) @@ -103,19 +78,14 @@ { LinkButton newBtn = (LinkButton)sender; LinkButton editBtn = (LinkButton)FormView1.FindControl("Edit"); - LinkButton deleteBtn = (LinkButton)FormView1.FindControl("Delete"); Label newLbl = (Label)FormView1.FindControl("newLbl"); - Label deleteLbl = (Label)FormView1.FindControl("deleteLbl"); if (!m_user.HasRight("dev_access")) { newBtn.Visible = false; - deleteBtn.Visible = false; newLbl.Visible = false; - deleteLbl.Visible = false; - } - if (!m_user.HasRight("edit_role",Constants.PRODUCT_ANYID)) editBtn.Visible = false; + } } protected void nameBox_Load(object sender, EventArgs e) { @@ -151,6 +121,7 @@ tcdbDataSetTableAdapters.db_rightsTableAdapter rAdapter = new tcdbDataSetTableAdapters.db_rightsTableAdapter(); rAdapter.Update(right.ID, right.CODE, right.NAME, right.DESCRIPTION, activeBox.Checked); } + protected void FormView1_DataBound(object sender, EventArgs e) { CheckBox activeBox = (CheckBox)FormView1.FindControl("activeBox"); @@ -177,28 +148,4 @@ roleList.Items.Add(item); } } - protected void roleList_DataBound(object sender, EventArgs e) - { - ListBox roleList = (ListBox)sender; - - if (FormView1.CurrentMode == FormViewMode.Edit) - { - tcdbDataSetTableAdapters.db_rightRoleTableAdapter rrAdapter = new tcdbDataSetTableAdapters.db_rightRoleTableAdapter(); - tcdbDataSet.db_rightRoleDataTable rrTable = rrAdapter.GetData(rightsID, active); - - foreach (tcdbDataSet.db_rightRoleRow row in rrTable) - { - ListItem item = roleList.Items.FindByValue(row.roleID.ToString()); - - item.Selected = true; - if (!row.active) - item.Attributes.CssStyle.Add("text_decoration", "line-through"); - } - } - else - { - if (role != null) - roleList.SelectedValue = role; - } - } } \ No newline at end of file Modified: Website/Includes/RoleAdmin.ascx.cs =================================================================== --- Website/Includes/RoleAdmin.ascx.cs 2006-08-08 18:39:41 UTC (rev 281) +++ Website/Includes/RoleAdmin.ascx.cs 2006-08-08 19:11:55 UTC (rev 282) @@ -86,7 +86,7 @@ return; } - if (!m_user.HasRight("edit_role",Constants.PRODUCT_ANYID) && !m_user.HasRight("dev_access")) + if (!m_user.HasRight("dev_access")) editRightsBtn.Visible = false; List<Right> rights = RightDB.TCDB_GetRightList(active); Modified: Website/Includes/Roles.ascx.cs =================================================================== --- Website/Includes/Roles.ascx.cs 2006-08-08 18:39:41 UTC (rev 281) +++ Website/Includes/Roles.ascx.cs 2006-08-08 19:11:55 UTC (rev 282) @@ -349,12 +349,13 @@ { LinkButton deleteBtn = (LinkButton)sender; Label deleteLbl = (Label)FormView1.FindControl("deleteLbl"); + Label activeLbl = (Label)FormView1.FindControl("activeLbl"); updateProductUsers(); Dictionary<String, ArrayList> ProductUsers = (Dictionary<String, ArrayList>)Session["ProductUsers"]; foreach (String productID in ProductUsers.Keys) { - if ( (ProductUsers[productID].Count > 0) && !m_user.HasRight("delete_role", Convert.ToInt32(productID))) + if ( activeLbl.Visible == true || ((ProductUsers[productID].Count > 0) && !m_user.HasRight("delete_role", Convert.ToInt32(productID)))) { deleteBtn.Visible = false; deleteLbl.Visible = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
