[tcdb-devel] SF.net SVN: tcdb: [315] Website/Includes/ActionItems.ascx.cs

[<m_h...@us...>]

Revision: 315
Author:   m_hildebrand
Date:     2006-08-14 10:28:52 -0700 (Mon, 14 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/tcdb/?rev=315&view=rev

Log Message:
-----------
Stupid SVN Merge

Modified Paths:
--------------
    Website/Includes/ActionItems.ascx.cs
Modified: Website/Includes/ActionItems.ascx.cs
===================================================================
--- Website/Includes/ActionItems.ascx.cs	2006-08-14 17:09:39 UTC (rev 314)
+++ Website/Includes/ActionItems.ascx.cs	2006-08-14 17:28:52 UTC (rev 315)
@@ -22,11 +22,7 @@
         private static Logger m_logg = new Logger("TCDB.ActionItems");
         private const string PREFIX = "AssignmentTab_";
         private ActionItem ai;
-<<<<<<< .mine
-        private String item_id = null;
-=======
         private int item_id = 0;
->>>>>>> .theirs
         private int productID = 0;
         private String mode = "";
         private bool current = false;
@@ -42,7 +38,6 @@
             {
                 current = true;
             }
-<<<<<<< .mine
 
             try
             {
@@ -55,30 +50,6 @@
                 ActionItemsView.ChangeMode(FormViewMode.Insert);
                 return;
             }
-
-
-            if (productID == 0)
-                productID = Constants.PRODUCT_SITEID;
-
-=======
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> .theirs
             // Load session data
             try
             {
@@ -404,10 +375,6 @@
             Response.Redirect("~/Assignments.aspx");
         }
 
-        protected void ActionItemsView_ItemInsert(object sender, FormViewInsertEventArgs e)
-        {
-            int i = 1;
-        }
         protected void ActionItemsView_ItemInserted(object sender, FormViewInsertedEventArgs e)
         {
             if (e.Exception == null)
@@ -445,22 +412,15 @@
         {
             if (e.Exception != null)
             {
-            updateStatus();
-<<<<<<< .mine
-            Session[Constants.CODE_ERROR] = "Action Item Updated";
-            Session.Remove(PREFIX + Constants.CODE_MODE);
-            Session[PREFIX + Constants.CODE_AI] = item_id.ToString();
-            Response.Redirect("~/Assignments.aspx");
-=======
-                Response.Redirect("ActionItem.aspx?" + Constants.CODE_AI + "=" + item_id);
-
-
-
->>>>>>> .theirs
+                updateStatus();
+                Session[Constants.CODE_ERROR] = "Action Item Updated";
+                Session.Remove(PREFIX + Constants.CODE_MODE);
+                Session[PREFIX + Constants.CODE_AI] = item_id.ToString();
+                Response.Redirect("~/Assignments.aspx");
+            }
         }
-        }
 
-        protected void statusList_Init(object sender, EventArgs e)
+        protected void statusList_Load(object sender, EventArgs e)
         {
             DropDownList statusList = (DropDownList)sender;
 
@@ -470,7 +430,7 @@
                      !(ai.CREATOR.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_STATUS_CREATED, productID))))
                 statusList.Enabled = false;
         }
-        protected void percentList_Init(object sender, EventArgs e)
+        protected void percentList_Load(object sender, EventArgs e)
         {
             RadioButtonList percentList = (RadioButtonList)sender;
 
@@ -480,7 +440,7 @@
                      !(ai.CREATOR.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_STATUS_CREATED, productID))))
                 percentList.Enabled = false;
         }
-        protected void dateFinished_Init(object sender, EventArgs e)
+        protected void dateFinished_Load(object sender, EventArgs e)
         {
             CalendarPopup dateFinished = (CalendarPopup)sender;
 
@@ -490,7 +450,7 @@
                      !(ai.CREATOR.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_STATUS_CREATED, productID))))
                 dateFinished.Enabled = false;
         }
-        protected void NewButton_Init(object sender, EventArgs e)
+        protected void NewButton_Load(object sender, EventArgs e)
         {
             LinkButton newBtn = (LinkButton)sender;
             Label newLbl = (Label)ActionItemsView.FindControl("newLbl");
@@ -502,7 +462,7 @@
                 newLbl.Visible = false;
             }
         }
-        protected void EditButton_Init(object sender, EventArgs e)
+        protected void EditButton_Load(object sender, EventArgs e)
         {
             LinkButton editBtn = (LinkButton)sender;
 
@@ -512,7 +472,7 @@
                     !(ai.CREATOR.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_EDIT_CREATED, productID)))
                 editBtn.Visible = false;
         }
-        protected void DeleteButton_Init(object sender, EventArgs e)
+        protected void DeleteButton_Load(object sender, EventArgs e)
         {
             LinkButton deleteBtn = (LinkButton)sender;
             Label deleteLbl = (Label)ActionItemsView.FindControl("deleteLbl");
@@ -569,7 +529,7 @@
 
             }
         }
-        protected void activeBox_Init(object sender, EventArgs e)
+        protected void activeBox_Load(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.