[tcdb-devel] SF.net SVN: tcdb: [271] Website

[<ro...@us...>]

Revision: 271
Author:   rouquin
Date:     2006-08-04 11:54:57 -0700 (Fri, 04 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/tcdb/?rev=271&view=rev

Log Message:
-----------
Fixed some bugs I came across.

1) Add user role to product (product default set)
2) New user - roles updated

Modified Paths:
--------------
    Website/App_Code/Assignments.cs
    Website/Includes/AdministrationTree.ascx.cs
    Website/Includes/Roles.ascx.cs
    Website/Includes/UserSettings.ascx
    Website/web.config
Modified: Website/App_Code/Assignments.cs
===================================================================
--- Website/App_Code/Assignments.cs	2006-08-04 18:06:33 UTC (rev 270)
+++ Website/App_Code/Assignments.cs	2006-08-04 18:54:57 UTC (rev 271)
@@ -66,7 +66,7 @@
                 {
                     assignment.WORKORDER = WorkOrderDB.TCDB_GetWorkOrder(row.childID);
                     assignment.WOTOTALTEST = row.WOTotalTest;
-                    assignment.WOPASSRATE = Convert.ToInt32(row.WOPassRate);
+                    //assignment.WOPASSRATE = Convert.ToInt32(row.WOPassRate);
                     assignment.WOPASS = row.WOPass;
                     assignment.WOFAIL = row.WOFail;
                     assignment.WOERROR = row.WOError;
@@ -512,7 +512,8 @@
 
         public User CREATOR
         {
-            get { return p_creator; }
+            get 
+            { return p_creator; }
             set { p_creator = value; }
         }
 

Modified: Website/Includes/AdministrationTree.ascx.cs
===================================================================
--- Website/Includes/AdministrationTree.ascx.cs	2006-08-04 18:06:33 UTC (rev 270)
+++ Website/Includes/AdministrationTree.ascx.cs	2006-08-04 18:54:57 UTC (rev 271)
@@ -352,7 +352,7 @@
     protected void BuildUserList(TreeNode parent)
     {
         tcdbDataSetTableAdapters.db_roleProductUserTableAdapter userAdapter = new tcdbDataSetTableAdapters.db_roleProductUserTableAdapter();
-        tcdbDataSet.db_roleProductUserDataTable userTable = userAdapter.GetData(null, Convert.ToInt32(parent.Parent.Value), null);
+        tcdbDataSet.db_roleProductUserDataTable userTable = userAdapter.GetData(null, Convert.ToInt32(parent.Parent.Value), true);
         int lastID = -1;
 
         foreach (tcdbDataSet.db_roleProductUserRow row in userTable)

Modified: Website/Includes/Roles.ascx.cs
===================================================================
--- Website/Includes/Roles.ascx.cs	2006-08-04 18:06:33 UTC (rev 270)
+++ Website/Includes/Roles.ascx.cs	2006-08-04 18:54:57 UTC (rev 271)
@@ -23,6 +23,7 @@
     int roleID = Convert.ToInt32(HttpContext.Current.Request.QueryString[Constants.CODE_ROLE]);
     Role role;
     String mode = HttpContext.Current.Request.QueryString["mode"];
+    String productID_in = HttpContext.Current.Request.QueryString[Constants.CODE_PRODUCT];
 
     protected void Page_Load(object sender, EventArgs e)
     {
@@ -276,6 +277,8 @@
         ListBox userList = (ListBox)FormView1.FindControl("userList");
 
         updateProductUsers(productList, userList);
+        if (productID_in != null)
+            productList.SelectedValue = productID_in;
         Session["product"] = productList.SelectedValue;
     }
     protected void ProductUserPanel_Init(object sender, EventArgs e)

Modified: Website/Includes/UserSettings.ascx
===================================================================
--- Website/Includes/UserSettings.ascx	2006-08-04 18:06:33 UTC (rev 270)
+++ Website/Includes/UserSettings.ascx	2006-08-04 18:54:57 UTC (rev 271)
@@ -111,10 +111,14 @@
             </div>
         </ItemTemplate>
         <EditItemTemplate>
-                    <asp:RequiredFieldValidator ID="usernameValidator" runat="server" ErrorMessage="You must have a username." ControlToValidate="usernameBox"></asp:RequiredFieldValidator>
-                    <asp:RequiredFieldValidator ID="firstnameValidator" runat="server" ErrorMessage="You must enter a first name." ControlToValidate="firstnameBox"></asp:RequiredFieldValidator>
-                    <asp:RequiredFieldValidator ID="lastnameValidator" runat="server" ErrorMessage="You must enter a last name." ControlToValidate="lastnameBox"></asp:RequiredFieldValidator>
-                    <asp:RequiredFieldValidator ID="emailValidator" runat="server" ErrorMessage="You must enter an email address." ControlToValidate="emailBox"></asp:RequiredFieldValidator>
+            <asp:RequiredFieldValidator ID="usernameValidator" runat="server" ErrorMessage="You must have a username."
+                ControlToValidate="usernameBox"></asp:RequiredFieldValidator>
+            <asp:RequiredFieldValidator ID="firstnameValidator" runat="server" ErrorMessage="You must enter a first name."
+                ControlToValidate="firstnameBox"></asp:RequiredFieldValidator>
+            <asp:RequiredFieldValidator ID="lastnameValidator" runat="server" ErrorMessage="You must enter a last name."
+                ControlToValidate="lastnameBox"></asp:RequiredFieldValidator>
+            <asp:RequiredFieldValidator ID="emailValidator" runat="server" ErrorMessage="You must enter an email address."
+                ControlToValidate="emailBox"></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>
@@ -284,7 +288,8 @@
                                     Roles:</label></div>
                             <div class="item">
                                 <asp:TreeView ID="roleTree" runat="server" OnInit="roleTreeEdit_Init" OnTreeNodePopulate="roleTree_TreeNodePopulate"
-                                    ShowCheckBoxes="All" OnSelectedNodeChanged="roleTree_SelectedNodeChanged" ShowExpandCollapse="false">
+                                    ShowCheckBoxes="All" OnSelectedNodeChanged="roleTree_SelectedNodeChanged" ShowExpandCollapse="false"
+                                    OnTreeNodeCheckChanged="roleTree_TreeNodeCheckChanged">
                                     <Nodes>
                                         <asp:TreeNode Text="" Value="Roles" PopulateOnDemand="True" Selected="false" ShowCheckBox="false" />
                                     </Nodes>

Modified: Website/web.config
===================================================================
--- Website/web.config	2006-08-04 18:06:33 UTC (rev 270)
+++ Website/web.config	2006-08-04 18:54:57 UTC (rev 271)
@@ -128,9 +128,11 @@
   </microsoft.web>
   <appSettings/>
   <connectionStrings>
-    <add name="tcdbConnectionString" connectionString="Data Source=dad.vintela.com\sqlserver2005;Initial Catalog=tcdb;Persist Security Info=True;User ID=tcdb;Password=tcdbpw;Connect Timeout=60"
-     providerName="System.Data.SqlClient" />
-  </connectionStrings>
+    <!-- 
+    <add name="tcdbConnectionString" connectionString="Data Source=tcdb.vintela.com\sqlserver2005;Initial Catalog=tcdb;Persist Security Info=True;User ID=tcdb;Password=tcdbpw;Connect Timeout=60" providerName="System.Data.SqlClient" />
+    -->
+    <add name="tcdbConnectionString" connectionString="Data Source=dad.vintela.com\sqlserver2005;Initial Catalog=tcdb;Persist Security Info=True;User ID=tcdb;Password=tcdbpw;Connect Timeout=60" providerName="System.Data.SqlClient" />
+</connectionStrings>
   <system.web>
     <sessionState mode="InProc" cookieless="false" timeout="20"/>
     


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.