[tcdb-devel] SF.net SVN: tcdb: [304] Website/Includes

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

Revision: 304
Author:   rouquin
Date:     2006-08-10 13:22:04 -0700 (Thu, 10 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/tcdb/?rev=304&view=rev

Log Message:
-----------
Fixed Jason's Assignment header bug

Modified Paths:
--------------
    Website/Includes/Administration.ascx.cs
    Website/Includes/Assignments.ascx.cs
    Website/Includes/AssignmentsTree.ascx.cs
    Website/Includes/Header_Menu.ascx.cs
Modified: Website/Includes/Administration.ascx.cs
===================================================================
--- Website/Includes/Administration.ascx.cs	2006-08-10 19:18:40 UTC (rev 303)
+++ Website/Includes/Administration.ascx.cs	2006-08-10 20:22:04 UTC (rev 304)
@@ -43,7 +43,6 @@
                 userRole.Visible = false;
         }
 
-
         protected void productList_Init(object sender, EventArgs e)
         {
 

Modified: Website/Includes/Assignments.ascx.cs
===================================================================
--- Website/Includes/Assignments.ascx.cs	2006-08-10 19:18:40 UTC (rev 303)
+++ Website/Includes/Assignments.ascx.cs	2006-08-10 20:22:04 UTC (rev 304)
@@ -59,16 +59,25 @@
                 if (m_user.HasRight(Constants.RIGHTS_AI_VIEW_OTHER, productID) || m_user.HasRight(Constants.RIGHTS_AI_VIEW_CREATED, productID) ||
                     m_user.HasRight(Constants.RIGHTS_WO_VIEW_OTHER, productID) || m_user.HasRight(Constants.RIGHTS_WO_VIEW_CREATED, productID))
                 {
-	                Product product = ProductDB.GetProduct(true, Convert.ToInt32(productID), null);
-
-                    if (product != null)
+                    if (mode == Constants.CODE_CREATED)
                     {
-                        m_logg.Debug("User has product admin rights, display all product users");
-
                         // Admin user should get everything, so don't set any values!
-                        Page.Title = "TCDB: " + product.NAME + " Assignments";
-                        header.Text = product.NAME + " Assignments";
+                        Page.Title = "TCDB: My Created Assignments";
+                        header.Text = "My Created Assignments";
                     }
+                    else
+                    {
+                        Product product = ProductDB.GetProduct(true, Convert.ToInt32(productID), null);
+
+                        if (product != null)
+                        {
+                            m_logg.Debug("User has product admin rights, display all product users");
+
+                            // Admin user should get everything, so don't set any values!
+                            Page.Title = "TCDB: " + product.NAME + " Assignments";
+                            header.Text = product.NAME + " Assignments";
+                        }
+                    }
                 }
                 else
                 {
@@ -98,18 +107,20 @@
             {
                 User user = UserDB.GetUserInfo(uid);
 
-                if (user.HasRights(productID) &&
-                    (m_user.HasRight(Constants.RIGHTS_AI_VIEW_OTHER, productID) || m_user.HasRight(Constants.RIGHTS_WO_VIEW_OTHER, productID) ||
-                     m_user.HasRight(Constants.RIGHTS_AI_VIEW_CREATED, productID) || m_user.HasRight(Constants.RIGHTS_WO_VIEW_CREATED, productID)))
+                if (m_user.HasRight(Constants.RIGHTS_AI_VIEW_OTHER, user, productID) || 
+                    m_user.HasRight(Constants.RIGHTS_WO_VIEW_OTHER, user,productID) ||
+                    m_user.HasRight(Constants.RIGHTS_AI_VIEW_CREATED, user, productID) || 
+                    m_user.HasRight(Constants.RIGHTS_WO_VIEW_CREATED, user, productID))
                 {
                     String name = user.FULLNAME;
                     m_logg.Debug("User requested assignments for [" + name + "]");
                     Page.Title = "TCDB: " + name + "'s Assignments";
                     header.Text = name + "'s Assignments";
+
                 }
             }
             if (mode == Constants.CODE_CREATED)
-                Session.Add("myID", m_user.ID);
+                Session["myID"] = m_user.ID;
 
             if (uid != 0)
                 Session.Add("uid", uid);

Modified: Website/Includes/AssignmentsTree.ascx.cs
===================================================================
--- Website/Includes/AssignmentsTree.ascx.cs	2006-08-10 19:18:40 UTC (rev 303)
+++ Website/Includes/AssignmentsTree.ascx.cs	2006-08-10 20:22:04 UTC (rev 304)
@@ -115,6 +115,7 @@
                         if (bool.Parse(GetValue(node, "IsCreated")))
                         {
                             Session[Constants.CODE_MODE] = Constants.CODE_CREATED;
+                            Session[Constants.CODE_PRODUCT] = Constants.PRODUCT_ANYID;
                         }
                     }
                     catch { }

Modified: Website/Includes/Header_Menu.ascx.cs
===================================================================
--- Website/Includes/Header_Menu.ascx.cs	2006-08-10 19:18:40 UTC (rev 303)
+++ Website/Includes/Header_Menu.ascx.cs	2006-08-10 20:22:04 UTC (rev 304)
@@ -22,6 +22,8 @@
         protected void LoadAssignments(object sender, CommandEventArgs e)
         {
             Session[Constants.CODE_USER] = m_user.ID;
+            Session.Remove(Constants.CODE_PRODUCT) ;
+            Session.Remove(Constants.CODE_MODE);
             Response.Redirect("Assignments.aspx");
         }
     }


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