From: <ro...@us...> - 2006-08-09 18:18:11
|
Revision: 289 Author: rouquin Date: 2006-08-09 11:18:06 -0700 (Wed, 09 Aug 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=289&view=rev Log Message: ----------- Bug fixes: 1) Enabling/disabled of date pickers disabled 2) Sorting columns refreshes rows. Modified Paths: -------------- Website/Includes/Assignments.ascx.cs Website/Includes/FeaturesTree.ascx.cs Website/Includes/Versions.ascx Modified: Website/Includes/Assignments.ascx.cs =================================================================== --- Website/Includes/Assignments.ascx.cs 2006-08-09 16:53:30 UTC (rev 288) +++ Website/Includes/Assignments.ascx.cs 2006-08-09 18:18:06 UTC (rev 289) @@ -323,8 +323,9 @@ } protected void AssignmentsGridView_Sorted(object sender, EventArgs e) { - foreach (GridViewRow row in AssignmentsGridView.Rows) - filter(row); + Session["refresh"] = true; + //foreach (GridViewRow row in AssignmentsGridView.Rows) + // filter(row); } protected void AssignmentsGridView_DataBinding(object sender, EventArgs e) { @@ -470,16 +471,6 @@ } protected void cboDateFilter_CheckedChanged(object sender, EventArgs e) { - if (cboDateFilter.Checked) - { - toDate.Enabled = true; - fromDate.Enabled = true; - } - else - { - toDate.Enabled = false; - fromDate.Enabled = false; - } Session["filterAssignedDate"] = cboDateFilter.Checked; Session.Add("refresh", true); @@ -487,16 +478,6 @@ } protected void cboDueFilter_CheckedChanged(object sender, EventArgs e) { - if (cboDueFilter.Checked) - { - toDueDate.Enabled = true; - fromDueDate.Enabled = true; - } - else - { - toDueDate.Enabled = false; - fromDueDate.Enabled = false; - } Session["filterDueDate"] = cboDueFilter.Checked; Session.Add("refresh", true); @@ -504,16 +485,6 @@ } protected void cboFinishedFilter_CheckedChanged(object sender, EventArgs e) { - if (cboFinishedFilter.Checked) - { - toFinishedDate.Enabled = true; - fromFinishedDate.Enabled = true; - } - else - { - toFinishedDate.Enabled = false; - fromFinishedDate.Enabled = false; - } Session["filterFinishedDate"] = cboFinishedFilter.Checked; Session.Add("refresh", true); Modified: Website/Includes/FeaturesTree.ascx.cs =================================================================== --- Website/Includes/FeaturesTree.ascx.cs 2006-08-09 16:53:30 UTC (rev 288) +++ Website/Includes/FeaturesTree.ascx.cs 2006-08-09 18:18:06 UTC (rev 289) @@ -13,7 +13,7 @@ namespace TCDB -{ +{ public partial class FeaturesTree : SiteUserControl { private static Logger m_logg = new Logger("TCDB.FeatureTree"); @@ -89,7 +89,7 @@ // Set additional properties for the node. newNode.SelectAction = TreeNodeSelectAction.Expand; - newNode.NavigateUrl = "~/Version.aspx?mode=read&i"+Constants.CODE_VERSION+"=" + newNode.Value; + newNode.NavigateUrl = "~/Version.aspx?mode=read&"+Constants.CODE_VERSION+"=" + newNode.Value; if (!version.ACTIVE) newNode.Text = "<font class='deleted'>" + newNode.Text + "</font>"; Modified: Website/Includes/Versions.ascx =================================================================== --- Website/Includes/Versions.ascx 2006-08-09 16:53:30 UTC (rev 288) +++ Website/Includes/Versions.ascx 2006-08-09 18:18:06 UTC (rev 289) @@ -42,18 +42,10 @@ <tr> <td align="left" colspan="2" valign="top"> <strong>Product:</strong> - <asp:Label ID="productName" runat="server" Text='<%# Eval("productID") %>'></asp:Label></td> + <asp:Label ID="productName" runat="server" Text='<%# Eval("productName") %>'></asp:Label></td> <td align="left" colspan="2" valign="top"> <strong>Platforms: </strong><br /> - <asp:ListBox ID="platformList" runat="server" DataSourceID="VersionPlatformDataSource" - DataTextField="platformName" DataValueField="platformID"></asp:ListBox><asp:SqlDataSource - ID="VersionPlatformDataSource" runat="server" ConnectionString="<%$ ConnectionStrings:tcdbConnectionString %>" - SelectCommand="sel_products" SelectCommandType="StoredProcedure"> - <SelectParameters> - <asp:Parameter DefaultValue="true" Name="active" Type="Boolean" /> - <asp:Parameter Name="productID" Type="Int32" /> - </SelectParameters> - </asp:SqlDataSource> + <asp:ListBox ID="platformList" runat="server"></asp:ListBox> </td> </tr> <tr> @@ -101,16 +93,13 @@ <tr> <td align="left" colspan="2"> <strong>Product:</strong> - <asp:DropDownList ID="productList" runat="server" DataSourceID="ProductDataSource" + <asp:DropDownList ID="productList" runat="server" DataSourceID="ProductsDataSource" DataTextField="name" DataValueField="productID" SelectedValue='<%# Bind("productID") %>'> - </asp:DropDownList><asp:ObjectDataSource ID="ProductDataSource" runat="server" OldValuesParameterFormatString="original_{0}" - SelectMethod="GetAllProductData" TypeName="DummyDataSetTableAdapters.productTableAdapter"> - </asp:ObjectDataSource> + </asp:DropDownList> </td> <td align="left" colspan="2" valign="top"> <strong>Platform:</strong><br /> - <asp:ListBox ID="platformList" runat="server" DataSourceID="PlatformDataSource" DataTextField="platformName" - DataValueField="platformID" OnDataBound="platformList_DataBound" SelectionMode="Multiple"> + <asp:ListBox ID="platformList" runat="server" OnDataBound="platformList_DataBound" SelectionMode="Multiple"> </asp:ListBox> </td> </tr> <tr> @@ -156,16 +145,13 @@ <tr> <td align="left" colspan="2"> <strong>Product:</strong> - <asp:DropDownList ID="productList" runat="server" DataSourceID="ProductDataSource" + <asp:DropDownList ID="productList" runat="server" DataSourceID="ProductsDataSource" DataTextField="name" DataValueField="productID" SelectedValue='<%# Bind("productID") %>'> - </asp:DropDownList><asp:ObjectDataSource ID="ProductDataSource" runat="server" OldValuesParameterFormatString="original_{0}" - SelectMethod="GetAllProductData" TypeName="DummyDataSetTableAdapters.productTableAdapter"> - </asp:ObjectDataSource> + </asp:DropDownList> </td> <td align="left" colspan="2" valign="top"> <strong>Platform:</strong><br /> - <asp:ListBox ID="platformList" runat="server" DataSourceID="PlatformDataSource" DataTextField="platformName" - DataValueField="platformID" SelectionMode="Multiple"></asp:ListBox> </td> + <asp:ListBox ID="platformList" runat="server" SelectionMode="Multiple"></asp:ListBox> </td> </tr> <tr> <td class="hr" colspan="4"> @@ -209,34 +195,11 @@ <asp:Parameter Name="active" Type="Boolean" /> </InsertParameters> </asp:ObjectDataSource> -<asp:ObjectDataSource ID="PlatformDataSource" runat="server" OldValuesParameterFormatString="original_{0}" - SelectMethod="GetData" TypeName="tcdbDataSetTableAdapters.db_productsTableAdapter" - InsertMethod="Insert" UpdateMethod="Update"> - <UpdateParameters> - <asp:Parameter Name="productID" Type="Int32" /> - <asp:Parameter Name="name" Type="String" /> - <asp:Parameter Name="description" Type="String" /> - <asp:Parameter Name="devManager" Type="Int32" /> - <asp:Parameter Name="qaManager" Type="Int32" /> - <asp:Parameter Name="devLead" Type="Int32" /> - <asp:Parameter Name="qaLead" Type="Int32" /> - <asp:Parameter Name="pm" Type="Int32" /> - <asp:Parameter Name="codeName" Type="String" /> - <asp:Parameter Name="active" Type="Boolean" /> - </UpdateParameters> +<asp:ObjectDataSource ID="ProductsDataSource" runat="server" OldValuesParameterFormatString="original_{0}" + SelectMethod="GetData" TypeName="tcdbDataSetTableAdapters.db_productsTableAdapter"> <SelectParameters> - <asp:Parameter Name="active" Type="Boolean" DefaultValue="true" /> + <asp:SessionParameter Name="active" SessionField="active" Type="Boolean" /> <asp:Parameter Name="productID" Type="Int32" /> + <asp:Parameter Name="productName" Type="String" /> </SelectParameters> - <InsertParameters> - <asp:Parameter Name="name" Type="String" /> - <asp:Parameter Name="description" Type="String" /> - <asp:Parameter Name="devManager" Type="Int32" /> - <asp:Parameter Name="qaManager" Type="Int32" /> - <asp:Parameter Name="devLead" Type="Int32" /> - <asp:Parameter Name="qaLead" Type="Int32" /> - <asp:Parameter Name="pm" Type="Int32" /> - <asp:Parameter Name="codeName" Type="String" /> - <asp:Parameter Name="active" Type="Boolean" /> - </InsertParameters> </asp:ObjectDataSource> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |