From: <ro...@us...> - 2006-08-14 17:47:31
|
Revision: 316 Author: rouquin Date: 2006-08-14 10:47:26 -0700 (Mon, 14 Aug 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=316&view=rev Log Message: ----------- Minor changes. Everything seems to be working now. Modified Paths: -------------- Website/Assignments.aspx Website/Includes/ActionItems.ascx Website/Includes/ActionItems.ascx.cs Modified: Website/Assignments.aspx =================================================================== --- Website/Assignments.aspx 2006-08-14 17:28:52 UTC (rev 315) +++ Website/Assignments.aspx 2006-08-14 17:47:26 UTC (rev 316) @@ -1,11 +1,11 @@ <%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" Title="TCDB: Assignments" - ClassName="TCDB.Page.Assignments" %> + ClassName="TCDB.Page.Assignments" ValidateRequest="false" %> <%@ Import Namespace="TCDB.Code" %> <%@ Register Src="~/Includes/AssignmentsTree.ascx" TagPrefix="assignment" TagName="Tree" %> <%@ Register Src="~/Includes/Assignments.ascx" TagPrefix="assignment" TagName="Form" %> <%@ Register Src="~/Includes/ActionItems.ascx" TagPrefix="assignment" TagName="ActionItem" %> -<%@ Register Src="~/Includes/ActionItems.ascx" TagPrefix="assignment" TagName="WorkOrder" %> +<%@ Register Src="~/Includes/WorkOrders.ascx" TagPrefix="assignment" TagName="WorkOrder" %> <asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" runat="Server"> <assignment:Tree runat="Server" ID="Tree" /> </asp:Content> Modified: Website/Includes/ActionItems.ascx =================================================================== --- Website/Includes/ActionItems.ascx 2006-08-14 17:28:52 UTC (rev 315) +++ Website/Includes/ActionItems.ascx 2006-08-14 17:47:26 UTC (rev 316) @@ -49,7 +49,7 @@ </asp:RadioButtonList></div> <asp:Label ID="deletedLbl" runat="server" Text="Deleted: "></asp:Label><strong></strong><asp:CheckBox ID="activeBox" runat="server" AutoPostBack="True" OnCheckedChanged="activeBox_CheckedChanged" - OnLoad="activeBox_Load" /></div> + OnInit="activeBox_Init" /></div> <div class="end"> </div> </div> Modified: Website/Includes/ActionItems.ascx.cs =================================================================== --- Website/Includes/ActionItems.ascx.cs 2006-08-14 17:28:52 UTC (rev 315) +++ Website/Includes/ActionItems.ascx.cs 2006-08-14 17:47:26 UTC (rev 316) @@ -410,7 +410,7 @@ } protected void ActionItemsView_ItemUpdated(object sender, FormViewUpdatedEventArgs e) { - if (e.Exception != null) + if (e.Exception == null) { updateStatus(); Session[Constants.CODE_ERROR] = "Action Item Updated"; @@ -422,6 +422,7 @@ protected void statusList_Load(object sender, EventArgs e) { + if (!current) return; DropDownList statusList = (DropDownList)sender; if (ai != null && @@ -432,6 +433,7 @@ } protected void percentList_Load(object sender, EventArgs e) { + if (!current) return; RadioButtonList percentList = (RadioButtonList)sender; if (ai != null && @@ -442,6 +444,7 @@ } protected void dateFinished_Load(object sender, EventArgs e) { + if (!current) return; CalendarPopup dateFinished = (CalendarPopup)sender; if (ai != null && @@ -452,6 +455,7 @@ } protected void NewButton_Load(object sender, EventArgs e) { + if (!current) return; LinkButton newBtn = (LinkButton)sender; Label newLbl = (Label)ActionItemsView.FindControl("newLbl"); @@ -464,6 +468,7 @@ } protected void EditButton_Load(object sender, EventArgs e) { + if (!current) return; LinkButton editBtn = (LinkButton)sender; if (ai != null && @@ -474,6 +479,7 @@ } protected void DeleteButton_Load(object sender, EventArgs e) { + if (!current) return; LinkButton deleteBtn = (LinkButton)sender; Label deleteLbl = (Label)ActionItemsView.FindControl("deleteLbl"); Label deletedLbl = (Label)ActionItemsView.FindControl("deletedLbl"); @@ -489,6 +495,7 @@ } protected void assignedTo_Load(object sender, EventArgs e) { + if (!current) return; DropDownList assignedTo = (DropDownList)sender; if (ai == null) ai = ActionItemDB.GetActionItem(item_id, active); @@ -529,7 +536,7 @@ } } - protected void activeBox_Load(object sender, EventArgs e) + protected void activeBox_Init(object sender, EventArgs e) { CheckBox activeBox = (CheckBox)sender; Label deletedLbl = (Label)ActionItemsView.FindControl("deletedLbl"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |