Menu
▾
▴
[tcdb-devel] SF.net SVN: tcdb: [276] Website/Includes
|
From: <ro...@us...> - 2006-08-07 14:01:22
|
Revision: 276 Author: rouquin Date: 2006-08-07 07:01:13 -0700 (Mon, 07 Aug 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=276&view=rev Log Message: ----------- Added rights enforcement to rights page and tweaked the roles & roleAdmin. Modified Paths: -------------- Website/Includes/Rights.ascx Website/Includes/Rights.ascx.cs Website/Includes/RoleAdmin.ascx.cs Website/Includes/Roles.ascx Website/Includes/Roles.ascx.cs Modified: Website/Includes/Rights.ascx =================================================================== --- Website/Includes/Rights.ascx 2006-08-05 19:00:23 UTC (rev 275) +++ Website/Includes/Rights.ascx 2006-08-07 14:01:13 UTC (rev 276) @@ -3,8 +3,13 @@ <asp:FormView ID="FormView1" runat="server" DataKeyNames="rightsID" DataSourceID="RightsDataSource" OnItemCommand="FormView1_ItemCommand" OnItemInserted="FormView1_ItemInserted" OnItemUpdated="FormView1_ItemUpdated"> - <EditItemTemplate> - <asp:RequiredFieldValidator ID="nameValidator" runat="server" ErrorMessage="You must enter a right name." ControlToValidate="nameBox"></asp:RequiredFieldValidator> + <HeaderTemplate> + <div align="left"> + <h2> + User Rights</h2> + </div> + </HeaderTemplate> + <ItemTemplate> <div class="xsnazzy"> <b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"> </b></b> @@ -13,7 +18,7 @@ <tr> <td align="left" colspan="6"> <strong>Name:</strong> - <asp:TextBox ID="nameBox" runat="server" Text='<%# Bind("rightsName") %>' Width="70%"></asp:TextBox></td> + <asp:Label ID="nameLabel" runat="server" Text='<%# Eval("rightsName") %>'></asp:Label></td> </tr> <tr> <td class="hr" colspan="6"> @@ -22,22 +27,25 @@ <tr> <td align="left" colspan="6" valign="top"> <strong>Description:</strong><br /> - <FTB:FreeTextBox ID="FreeTextBox1" runat="server" Height="200px" SupportFolder="~/aspnet_client/FreeTextBox/" - Text='<%# Bind("rightsDescription") %>' Width="100%" EnableHtmlMode="True"> - </FTB:FreeTextBox> - </td> + <asp:Label ID="descriptionLbl" runat="server" Text='<%# Eval("rightsDescription") %>'></asp:Label></td> </tr> <tr> - <td class="hr" colspan="6"> + <td class="hr" colspan="6" style="height: 1px"> </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> + </strong> <asp:ListBox ID="roleList" runat="server" DataSourceID="RightRolesDataSource" + DataTextField="roleName" DataValueField="roleID"></asp:ListBox><asp:ObjectDataSource + ID="RightRolesDataSource" runat="server" OldValuesParameterFormatString="original_{0}" + SelectMethod="GetData" TypeName="tcdbDataSetTableAdapters.db_rightRoleTableAdapter"> + <SelectParameters> + <asp:SessionParameter Name="rightID" SessionField="rightsID" Type="Int32" /> + <asp:Parameter DefaultValue="true" Name="active" Type="Boolean" /> + </SelectParameters> + </asp:ObjectDataSource> + </td> <td align="left" colspan="2" valign="top" width="33%"> </td> <td align="left" colspan="2" valign="top" width="34%"> @@ -49,22 +57,21 @@ </tr> <tr> <td align="left" colspan="6"> - <asp:LinkButton ID="UpdateButton" runat="server" CausesValidation="True" CommandName="Update" - Text="Update"> - </asp:LinkButton> - | - <asp:LinkButton ID="UpdateCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" - Text="Cancel"> - </asp:LinkButton></td> + <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> </tr> </table> </div> <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> </b></b> </div> - </EditItemTemplate> - <InsertItemTemplate> - <asp:RequiredFieldValidator ID="nameValidator" runat="server" ErrorMessage="You must enter a right name." ControlToValidate="nameBox"></asp:RequiredFieldValidator> + </ItemTemplate> + <EditItemTemplate> + <asp:RequiredFieldValidator ID="nameValidator" runat="server" ErrorMessage="You must enter a right name." + ControlToValidate="nameBox"></asp:RequiredFieldValidator> <div class="xsnazzy"> <b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"> </b></b> @@ -73,7 +80,8 @@ <tr> <td align="left" colspan="6"> <strong>Name:</strong> - <asp:TextBox ID="nameBox" runat="server" Text='<%# Bind("rightsName") %>' Width="70%"></asp:TextBox></td> + <asp:TextBox ID="nameBox" runat="server" Text='<%# Bind("rightsName") %>' Width="70%" OnLoad="nameBox_Load"></asp:TextBox> + <asp:Label ID="nameLbl" runat="server" Text='<%# Eval("rightsName") %>' Visible="False"></asp:Label></td> </tr> <tr> <td class="hr" colspan="6"> @@ -82,10 +90,10 @@ <tr> <td align="left" colspan="6" valign="top"> <strong>Description:</strong><br /> - <FTB:FreeTextBox ID="FreeTextBox1" runat="server" Height="200px" SupportFolder="~/aspnet_client/FreeTextBox/" + <FTB:FreeTextBox ID="descriptionBox" runat="server" Height="200px" SupportFolder="~/aspnet_client/FreeTextBox/" Text='<%# Bind("rightsDescription") %>' Width="100%" EnableHtmlMode="True"> </FTB:FreeTextBox> - </td> + <asp:Label ID="descriptionLbl" runat="server" Text='<%# Eval("rightsDescription") %>' Visible="false"></asp:Label></td> </tr> <tr> <td class="hr" colspan="6"> @@ -109,8 +117,9 @@ </tr> <tr> <td align="left" colspan="6"> - <asp:LinkButton ID="InsertButton" runat="server" CausesValidation="True" CommandName="Insert" - Text="Insert"></asp:LinkButton> + <asp:LinkButton ID="UpdateButton" runat="server" CausesValidation="True" CommandName="Update" + Text="Update"> + </asp:LinkButton> | <asp:LinkButton ID="UpdateCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" Text="Cancel"> @@ -121,8 +130,10 @@ <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> </b></b> </div> - </InsertItemTemplate> - <ItemTemplate> + </EditItemTemplate> + <InsertItemTemplate> + <asp:RequiredFieldValidator ID="nameValidator" runat="server" ErrorMessage="You must enter a right name." + ControlToValidate="nameBox"></asp:RequiredFieldValidator> <div class="xsnazzy"> <b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"> </b></b> @@ -131,7 +142,7 @@ <tr> <td align="left" colspan="6"> <strong>Name:</strong> - <asp:Label ID="nameLabel" runat="server" Text='<%# Eval("rightsName") %>'></asp:Label></td> + <asp:TextBox ID="nameBox" runat="server" Text='<%# Bind("rightsName") %>' Width="70%"></asp:TextBox></td> </tr> <tr> <td class="hr" colspan="6"> @@ -140,25 +151,22 @@ <tr> <td align="left" colspan="6" valign="top"> <strong>Description:</strong><br /> - <asp:Label ID="descriptionLbl" runat="server" Text='<%# Eval("rightsDescription") %>'></asp:Label></td> + <FTB:FreeTextBox ID="FreeTextBox1" runat="server" Height="200px" SupportFolder="~/aspnet_client/FreeTextBox/" + Text='<%# Bind("rightsDescription") %>' Width="100%" EnableHtmlMode="True"> + </FTB:FreeTextBox> + </td> </tr> <tr> - <td class="hr" colspan="6" style="height: 1px"> + <td class="hr" colspan="6"> </td> </tr> <tr> <td align="left" colspan="2" valign="top" width="33%"> <strong>Roles:<br /> - </strong> <asp:ListBox ID="roleList" runat="server" DataSourceID="RightRolesDataSource" - DataTextField="roleName" DataValueField="roleID"></asp:ListBox><asp:ObjectDataSource - ID="RightRolesDataSource" runat="server" OldValuesParameterFormatString="original_{0}" - SelectMethod="GetData" TypeName="tcdbDataSetTableAdapters.db_rightRoleTableAdapter"> - <SelectParameters> - <asp:SessionParameter Name="rightID" SessionField="rightsID" Type="Int32" /> - <asp:Parameter DefaultValue="true" Name="active" Type="Boolean" /> - </SelectParameters> - </asp:ObjectDataSource> - </td> + </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%"> @@ -170,28 +178,23 @@ </tr> <tr> <td align="left" colspan="6"> - <asp:LinkButton ID="New" runat="server" CommandName="new">New</asp:LinkButton> + <asp:LinkButton ID="InsertButton" runat="server" CausesValidation="True" CommandName="Insert" + Text="Insert"></asp:LinkButton> | - <asp:LinkButton ID="Edit" runat="server" CommandName="edit">Edit</asp:LinkButton> - | - <asp:LinkButton ID="Delete" runat="server" CommandName="deleteCmd" OnCommand="deleteCmd">Delete</asp:LinkButton></td> + <asp:LinkButton ID="UpdateCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" + Text="Cancel"> + </asp:LinkButton></td> </tr> </table> </div> <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> </b></b> </div> - </ItemTemplate> - <HeaderTemplate> - <div align="left"> - <h2> - User Rights</h2> - </div> - </HeaderTemplate> + </InsertItemTemplate> </asp:FormView> -<asp:ObjectDataSource ID="RightsDataSource" runat="server" - SelectMethod="GetData" TypeName="tcdbDataSetTableAdapters.db_rightsTableAdapter" - InsertMethod="Insert" UpdateMethod="Update" OldValuesParameterFormatString="original_{0}"> +<asp:ObjectDataSource ID="RightsDataSource" runat="server" SelectMethod="GetData" + TypeName="tcdbDataSetTableAdapters.db_rightsTableAdapter" InsertMethod="Insert" + UpdateMethod="Update" OldValuesParameterFormatString="original_{0}"> <SelectParameters> <asp:SessionParameter Name="rightsID" SessionField="rightsID" Type="Int32" /> <asp:Parameter Name="rightsName" Type="String" /> @@ -209,7 +212,8 @@ </InsertParameters> </asp:ObjectDataSource> <asp:ObjectDataSource ID="RolesDataSource" runat="server" OldValuesParameterFormatString="original_{0}" - SelectMethod="GetData" TypeName="tcdbDataSetTableAdapters.db_roleTableAdapter" InsertMethod="Insert" UpdateMethod="Update"> + SelectMethod="GetData" TypeName="tcdbDataSetTableAdapters.db_roleTableAdapter" + InsertMethod="Insert" UpdateMethod="Update"> <SelectParameters> <asp:Parameter Name="roleID" Type="Int32" /> <asp:Parameter Name="roleName" Type="String" /> Modified: Website/Includes/Rights.ascx.cs =================================================================== --- Website/Includes/Rights.ascx.cs 2006-08-05 19:00:23 UTC (rev 275) +++ Website/Includes/Rights.ascx.cs 2006-08-07 14:01:13 UTC (rev 276) @@ -35,14 +35,16 @@ Response.Redirect("~/Administration.aspx"); } } + if (!m_user.HasRight("view_rights", Constants.PRODUCT_ANYID)) + Response.Redirect("~/Administration.aspx"); Session.Add("rightsID", rightsID); right = RightDB.GetRightInfo(rightsID); Session.Add("tableName", "tcdb_rights"); - if (mode == "new") + if (mode == "new" && m_user.HasRight("dev_access")) FormView1.ChangeMode(FormViewMode.Insert); - else if (mode == "edit") + else if (mode == "edit" && (m_user.HasRight("dev_access") || m_user.HasRight("edit_role",Constants.PRODUCT_ANYID))) FormView1.ChangeMode(FormViewMode.Edit); } @@ -130,4 +132,37 @@ roleList.SelectedValue = role; } } + protected void New_Init(object sender, EventArgs e) + { + 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) + { + TextBox nameBox = (TextBox)FormView1.FindControl("nameBox"); + FreeTextBoxControls.FreeTextBox descriptionBox = (FreeTextBoxControls.FreeTextBox)FormView1.FindControl("descriptionBox"); + Label nameLbl = (Label)FormView1.FindControl("nameLbl"); + Label descriptionLbl = (Label)FormView1.FindControl("descriptionLbl"); + + if (!m_user.HasRight("dev_access")) + { + nameBox.Visible = false; + descriptionBox.Visible = false; + nameLbl.Visible = true; + descriptionLbl.Visible = true; + } + } } \ No newline at end of file Modified: Website/Includes/RoleAdmin.ascx.cs =================================================================== --- Website/Includes/RoleAdmin.ascx.cs 2006-08-05 19:00:23 UTC (rev 275) +++ Website/Includes/RoleAdmin.ascx.cs 2006-08-07 14:01:13 UTC (rev 276) @@ -69,6 +69,26 @@ foreach (tcdbDataSet.db_roleRow row in rTable) roleList.Items.Add(new ListItem(row.roleName, row.roleID.ToString())); } + protected void rightsList_Init(object sender, EventArgs e) + { + if (!m_user.HasRight("view_rights",Constants.PRODUCT_ANYID)) + { + rightsList.Visible = false; + viewRightBtn.Visible = false; + editRightsBtn.Visible = false; + + return; + } + if (!m_user.HasRight("edit_role",Constants.PRODUCT_ANYID) && !m_user.HasRight("dev_access")) + editRightsBtn.Visible = false; + + tcdbDataSetTableAdapters.db_rightsTableAdapter rAdapter = new tcdbDataSetTableAdapters.db_rightsTableAdapter(); + tcdbDataSet.db_rightsDataTable rTable = rAdapter.GetData(null, null, active); + + foreach (tcdbDataSet.db_rightsRow row in rTable) + rightsList.Items.Add(new ListItem(row.rightsName, row.rightsID.ToString())); + } + protected void addRoleBtn_Load(object sender, EventArgs e) { String role = roleList.SelectedItem.Text; @@ -85,21 +105,4 @@ viewRoleBtn.Visible = false; } - protected void rightsList_Init(object sender, EventArgs e) - { - if (!m_user.HasRight("dev_access")) - { - rightsList.Visible = false; - viewRightBtn.Visible = false; - editRightsBtn.Visible = false; - - return; - } - - tcdbDataSetTableAdapters.db_rightsTableAdapter rAdapter = new tcdbDataSetTableAdapters.db_rightsTableAdapter(); - tcdbDataSet.db_rightsDataTable rTable = rAdapter.GetData(null, null, active); - - foreach (tcdbDataSet.db_rightsRow row in rTable) - rightsList.Items.Add(new ListItem(row.rightsName, row.rightsID.ToString())); - } } Modified: Website/Includes/Roles.ascx =================================================================== --- Website/Includes/Roles.ascx 2006-08-05 19:00:23 UTC (rev 275) +++ Website/Includes/Roles.ascx 2006-08-07 14:01:13 UTC (rev 276) @@ -81,7 +81,8 @@ <tr> <td align="left" colspan="6"> <strong>Name:</strong> - <asp:TextBox ID="nameBox" runat="server" Text='<%# Bind("roleName") %>' Width="70%" OnInit="nameBox_Init"></asp:TextBox></td> + <asp:TextBox ID="nameBox" runat="server" Text='<%# Bind("roleName") %>' Width="70%" OnLoad="nameBox_Load"></asp:TextBox> + <asp:Label ID="nameLbl" runat="server" Text='<%# Eval("roleName") %>' Visible="False"></asp:Label></td> </tr> <tr> <td class="hr" colspan="6"> @@ -92,9 +93,10 @@ <strong>Description:</strong><br /> <FTB:FreeTextBox ID="descriptionBox" runat="server" SupportFolder="~/aspnet_client/FreeTextBox/" Width="100%" Text='<%# Bind("roleDescription") %>' Height="200px" EnableHtmlMode="true" - DisableIEBackButton="False" OnInit="descriptionBox_Init"> + DisableIEBackButton="False"> </FTB:FreeTextBox> - </td> + <asp:Label ID="descriptionLbl" runat="server" Text='<%# Eval("roleDescription") %>' + Visible="False"></asp:Label></td> </tr> <tr> <td class="hr" colspan="6"> Modified: Website/Includes/Roles.ascx.cs =================================================================== --- Website/Includes/Roles.ascx.cs 2006-08-05 19:00:23 UTC (rev 275) +++ Website/Includes/Roles.ascx.cs 2006-08-07 14:01:13 UTC (rev 276) @@ -354,20 +354,6 @@ } } } - protected void nameBox_Init(object sender, EventArgs e) - { - TextBox nameBox = (TextBox)sender; - - if (!m_user.HasRight("edit_role", Constants.PRODUCT_ANYID)) - nameBox.Enabled = false; - } - protected void descriptionBox_Init(object sender, EventArgs e) - { - FreeTextBoxControls.FreeTextBox descriptionBox = (FreeTextBoxControls.FreeTextBox)sender; - - if (!m_user.HasRight("edit_role", Constants.PRODUCT_ANYID)) - descriptionBox.Visible = false; - } protected void rightsList_Init(object sender, EventArgs e) { ListBox rightsList = (ListBox)sender; @@ -430,4 +416,19 @@ userList_populate(); } + protected void nameBox_Load(object sender, EventArgs e) + { + TextBox nameBox = (TextBox)FormView1.FindControl("nameBox"); + FreeTextBoxControls.FreeTextBox descriptionBox = (FreeTextBoxControls.FreeTextBox)FormView1.FindControl("descriptionBox"); + Label nameLbl = (Label)FormView1.FindControl("nameLbl"); + Label descriptionLbl = (Label)FormView1.FindControl("descriptionLbl"); + + if (!m_user.HasRight("edit_role",Constants.PRODUCT_ANYID)) + { + nameBox.Visible = false; + descriptionBox.Visible = false; + nameLbl.Visible = true; + descriptionLbl.Visible = true; + } + } } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
