[evolvis-commits] r6757: Merged from customize-pm-display branch

mirabilos at evolvis.org mirabilos at evolvis.org
Fri Jun 25 15:55:55 CEST 2010


Author: mirabilos
Date: 2010-06-25 15:55:55 +0200 (Fri, 25 Jun 2010)
New Revision: 6757

Modified:
   trunk/gforge_base/evolvisforge/gforge/www/pm/browse_task.php
   trunk/gforge_base/evolvisforge/gforge/www/pm/select_columns.php
Log:
Merged from customize-pm-display branch

Modified: trunk/gforge_base/evolvisforge/gforge/www/pm/browse_task.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/pm/browse_task.php	2010-06-25 13:55:52 UTC (rev 6756)
+++ trunk/gforge_base/evolvisforge/gforge/www/pm/browse_task.php	2010-06-25 13:55:55 UTC (rev 6757)
@@ -19,12 +19,12 @@
 
 //Preselect columns (added in session) only done on first loading of page.
 if (isset( $_GET['firstTime'])) { 
-        $u->setPreference('start_date', true);
-        $u->setPreference('end_date', true);
-        $u->setPreference('priority', true);
-        $u->setPreference('status', true);
-        $u->setPreference('percentComplete', true);
-		$u->setPreference('summary', true);
+        $u->setPreference('pmdisplay:start_date', true);
+        $u->setPreference('pmdisplay:end_date', true);
+        $u->setPreference('pmdisplay:priority', true);
+        $u->setPreference('pmdisplay:status', true);
+        $u->setPreference('pmdisplay:percentComplete', true);
+		$u->setPreference('pmdisplay:summary', true);
 }
 
 require_once $gfcommon.'pm/ProjectTaskFactory.class.php';
@@ -242,27 +242,27 @@
 /*
  * Get parameters for selecting customized columns in showing tasks details.
 */
-$summary = $u->getPreference('summary');
-$start_date = $u->getPreference('start_date');
-$end_date = $u->getPreference('end_date');
-$percentComplete = $u->getPreference('percentComplete');
-$category = $u->getPreference('category');
-$assignedTo = $u->getPreference('assignedTo');
-$priority = $u->getPreference('priority');
-$status = $u->getPreference('status');
-$projectTaskId = $u->getPreference('projectTaskId');
-$realName = $u->getPreference('realName');
-$duration = $u->getPreference('duration');
-$parentId = $u->getPreference('parentId');
-$userName = $u->getPreference('userName');
-$details = $u->getPreference('details');
-$hours = $u->getPreference('hours');
-$statusId = $u->getPreference('statusId');
-$categoryId = $u->getPreference('categoryId');
-$categoryName = $u->getPreference('categoryName');
-$lastModifiedDate = $u->getPreference('lastModifiedDate');
-$externalId = $u->getPreference('externalId');
-$subProjectName = $u->getPreference('sub_project_name');
+$summary = $u->getPreference('pmdisplay:summary');
+$start_date = $u->getPreference('pmdisplay:start_date');
+$end_date = $u->getPreference('pmdisplay:end_date');
+$percentComplete = $u->getPreference('pmdisplay:percentComplete');
+$category = $u->getPreference('pmdisplay:category');
+$assignedTo = $u->getPreference('pmdisplay:assignedTo');
+$priority = $u->getPreference('pmdisplay:priority');
+$status = $u->getPreference('pmdisplay:status');
+$projectTaskId = $u->getPreference('pmdisplay:projectTaskId');
+$realName = $u->getPreference('pmdisplay:realName');
+$duration = $u->getPreference('pmdisplay:duration');
+$parentId = $u->getPreference('pmdisplay:parentId');
+$userName = $u->getPreference('pmdisplay:userName');
+$details = $u->getPreference('pmdisplay:details');
+$hours = $u->getPreference('pmdisplay:hours');
+$statusId = $u->getPreference('pmdisplay:statusId');
+$categoryId = $u->getPreference('pmdisplay:categoryId');
+$categoryName = $u->getPreference('pmdisplay:categoryName');
+$lastModifiedDate = $u->getPreference('pmdisplay:lastModifiedDate');
+$externalId = $u->getPreference('pmdisplay:externalId');
+$subProjectName = $u->getPreference('pmdisplay:sub_project_name');
 
 
 echo '

Modified: trunk/gforge_base/evolvisforge/gforge/www/pm/select_columns.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/pm/select_columns.php	2010-06-25 13:55:52 UTC (rev 6756)
+++ trunk/gforge_base/evolvisforge/gforge/www/pm/select_columns.php	2010-06-25 13:55:55 UTC (rev 6757)
@@ -30,26 +30,26 @@
 	if (isset( $_POST['Submit'])) { //Only called when submit button is pressed
 		//Add remove values from session based on user selections.
 	
-		if($_POST['summary']) $u->setPreference('summary',true); else $u->deletePreference('summary');	
-		if($_POST['start_date']) $u->setPreference('start_date',true); else $u->deletePreference('start_date');
-        if($_POST['end_date'] ) $u->setPreference('end_date',true); else $u->deletePreference('end_date');
-        if($_POST['percentComplete']) $u->setPreference('percentComplete',true); else $u->deletePreference('percentComplete');
-        if($_POST['category'] ) $u->setPreference('category',true); else $u->deletePreference('category');
-        if($_POST['assignedTo']) $u->setPreference('assignedTo',true); else $u->deletePreference('assignedTo');
-        if($_POST['priority'] ) $u->setPreference('priority',true); else $u->deletePreference('priority');
-        if($_POST['status']) $u->setPreference('status',true); else $u->deletePreference('status');
-        if($_POST['realName']) $u->setPreference('realName',true); else $u->deletePreference('realName');
-        if($_POST['duration']) $u->setPreference('duration',true); else $u->deletePreference('duration');
-        if($_POST['parentId']) $u->setPreference('parentId',true); else $u->deletePreference('parentId');
-        if($_POST['userName']) $u->setPreference('userName',true); else $u->deletePreference('userName');
-        if($_POST['details']) $u->setPreference('details',true); else $u->deletePreference('details');
-        if($_POST['hours']) $u->setPreference('hours',true); else $u->deletePreference('hours');
-        if($_POST['statusId']) $u->setPreference('statusId',true); else $u->deletePreference('statusId');
-        if($_POST['categoryId']) $u->setPreference('categoryId',true); else $u->deletePreference('categoryId');
-        if($_POST['categoryName'] ) $u->setPreference('categoryName',true); else $u->deletePreference('categoryName');
-        if($_POST['lastModifiedDate']) $u->setPreference('lastModifiedDate',true); else $u->deletePreference('lastModifiedDate');
-        if($_POST['externalId']) $u->setPreference('externalId',true); else $u->deletePreference('externalId');
-		if($_POST['sub_project_name']) $u->setPreference('sub_project_name',true); else $u->deletePreference('sub_project_name');
+		if($_POST['summary']) $u->setPreference('pmdisplay:summary',true); else $u->deletePreference('pmdisplay:summary');	
+		if($_POST['start_date']) $u->setPreference('pmdisplay:start_date',true); else $u->deletePreference('pmdisplay:start_date');
+        if($_POST['end_date'] ) $u->setPreference('pmdisplay:end_date',true); else $u->deletePreference('pmdisplay:end_date');
+        if($_POST['percentComplete']) $u->setPreference('pmdisplay:percentComplete',true); else $u->deletePreference('pmdisplay:percentComplete');
+        if($_POST['category'] ) $u->setPreference('pmdisplay:category',true); else $u->deletePreference('pmdisplay:category');
+        if($_POST['assignedTo']) $u->setPreference('pmdisplay:assignedTo',true); else $u->deletePreference('pmdisplay:assignedTo');
+        if($_POST['priority'] ) $u->setPreference('pmdisplay:priority',true); else $u->deletePreference('pmdisplay:priority');
+        if($_POST['status']) $u->setPreference('pmdisplay:status',true); else $u->deletePreference('pmdisplay:status');
+        if($_POST['realName']) $u->setPreference('pmdisplay:realName',true); else $u->deletePreference('pmdisplay:realName');
+        if($_POST['duration']) $u->setPreference('pmdisplay:duration',true); else $u->deletePreference('pmdisplay:duration');
+        if($_POST['parentId']) $u->setPreference('pmdisplay:parentId',true); else $u->deletePreference('pmdisplay:parentId');
+        if($_POST['userName']) $u->setPreference('pmdisplay:userName',true); else $u->deletePreference('pmdisplay:userName');
+        if($_POST['details']) $u->setPreference('pmdisplay:details',true); else $u->deletePreference('pmdisplay:details');
+        if($_POST['hours']) $u->setPreference('pmdisplay:hours',true); else $u->deletePreference('pmdisplay:hours');
+        if($_POST['statusId']) $u->setPreference('pmdisplay:statusId',true); else $u->deletePreference('pmdisplay:statusId');
+        if($_POST['categoryId']) $u->setPreference('pmdisplay:categoryId',true); else $u->deletePreference('pmdisplay:categoryId');
+        if($_POST['categoryName'] ) $u->setPreference('pmdisplay:categoryName',true); else $u->deletePreference('pmdisplay:categoryName');
+        if($_POST['lastModifiedDate']) $u->setPreference('pmdisplay:lastModifiedDate',true); else $u->deletePreference('pmdisplay:lastModifiedDate');
+        if($_POST['externalId']) $u->setPreference('pmdisplay:externalId',true); else $u->deletePreference('pmdisplay:externalId');
+		if($_POST['sub_project_name']) $u->setPreference('pmdisplay:sub_project_name',true); else $u->deletePreference('pmdisplay:sub_project_name');
 	
 	}
 
@@ -113,27 +113,27 @@
 		<table>
                 <tr> <th> Columns </th> <th> Add </th>
                 <tr> <td colspan="2">&nbsp;</tr>
-                </tr> <tr> <td> Summary </td> <td> <input type="checkbox" name="summary" <?php if($u->getPreference('summary')){ ?> checked <?php }?> id="summary"  /> </td>  </tr>
-                <tr> <td> Start Date </td> <td> <input type="checkbox" name="start_date" <?php if($u->getPreference('start_date')){ ?> checked <?php }?> /> </td> </tr>
-                <tr> <td> End Date </td> <td> <input type="checkbox" name="end_date"  <?php if($u->getPreference('end_date')){ ?> checked <?php }?> /> </td> </tr>   
-                <tr> <td> Percent Complete </td> <td> <input type="checkbox" name="percentComplete" <?php if($u->getPreference('percentComplete')){ ?> checked <?php }?> /> </td></tr>  
-                <tr> <td> Category </td> <td> <input type="checkbox" name="category"  <?php if($u->getPreference('category')){ ?> checked <?php }?> /> </td> </tr>
-                <tr>  <td> Assigned To </td> <td> <input type="checkbox" name="assignedTo"  <?php if($u->getPreference('assignedTo')){ ?> checked <?php }?> /> </td> </tr>
-                <tr> <td> Priority </td> <td> <input type="checkbox" name="priority" <?php if($u->getPreference('priority')){ ?> checked <?php }?>  /> </td> </tr>
-                <tr> <td> Status</td> <td> <input type="checkbox" name="status" <?php if($u->getPreference('status')){ ?> checked <?php }?>  /> </td> </tr>
-                <!-- <tr> <td> Project Task Id </td> <td> <input type="checkbox" name="projectTaskId" <?php if($u->getPreference('projectTaskId')){ ?> checked <?php }?>  /> </td> </tr> -->
-                <tr> <td> Real Name </td> <td> <input type="checkbox" name="realName" <?php if($u->getPreference('realName')){ ?> checked <?php }?>  /> </td> </tr>
-                <tr> <td> Duration </td> <td> <input type="checkbox" name="duration" <?php if($u->getPreference('duration')){ ?> checked <?php }?> /> </td> </tr>
-                <tr> <td> Parent Id </td> <td> <input type="checkbox" name="parentId" <?php if($u->getPreference('parentId')){ ?> checked <?php }?>  /> </td> </tr>
-                <tr> <td> User Name </td> <td> <input type="checkbox" name="userName" <?php if($u->getPreference('userName')){ ?> checked <?php }?>  /> </td> </tr>
-                <tr> <td> Details </td> <td> <input type="checkbox" name="details" <?php if($u->getPreference('details')){ ?> checked <?php }?>  /> </td> </tr>
-                <tr> <td> Hours </td> <td> <input type="checkbox" name="hours"  <?php if($u->getPreference('hours')){ ?> checked <?php }?>/> </td> </tr>
-                <tr> <td> Status Id </td> <td> <input type="checkbox" name="statusId" <?php if($u->getPreference('statusId')){ ?> checked <?php }?> /> </td> </tr>
-                <tr> <td> Category Id </td> <td> <input type="checkbox" name="categoryId"  <?php if($u->getPreference('categoryId')){ ?> checked <?php }?>/> </td> </tr>
-                <tr> <td> Category Name </td> <td> <input type="checkbox" name="categoryName" <?php if($u->getPreference('categoryName')){ ?> checked <?php }?> /> </td> </tr>
-                <tr> <td> Last Modified Date </td> <td> <input type="checkbox" name="lastModifiedDate" <?php if($u->getPreference('lastModifiedDate')){ ?> checked <?php }?>  /> </td> </tr>
-				<tr> <td> External Id </td> <td> <input type="checkbox" name="externalId" <?php if($u->getPreference('externalId')){ ?> checked <?php }?>  /> </td> </tr>
-				<tr> <td> Sub-Project </td> <td> <input type="checkbox" name="sub_project_name" <?php if($u->getPreference('sub_project_name')){ ?> checked <?php }?>  /> </td> </tr>
+                </tr> <tr> <td> Summary </td> <td> <input type="checkbox" name="summary" <?php if($u->getPreference('pmdisplay:summary')){ ?> checked <?php }?> id="summary"  /> </td>  </tr>
+                <tr> <td> Start Date </td> <td> <input type="checkbox" name="start_date" <?php if($u->getPreference('pmdisplay:start_date')){ ?> checked <?php }?> /> </td> </tr>
+                <tr> <td> End Date </td> <td> <input type="checkbox" name="end_date"  <?php if($u->getPreference('pmdisplay:end_date')){ ?> checked <?php }?> /> </td> </tr>   
+                <tr> <td> Percent Complete </td> <td> <input type="checkbox" name="percentComplete" <?php if($u->getPreference('pmdisplay:percentComplete')){ ?> checked <?php }?> /> </td></tr>  
+                <tr> <td> Category </td> <td> <input type="checkbox" name="category"  <?php if($u->getPreference('pmdisplay:category')){ ?> checked <?php }?> /> </td> </tr>
+                <tr>  <td> Assigned To </td> <td> <input type="checkbox" name="assignedTo"  <?php if($u->getPreference('pmdisplay:assignedTo')){ ?> checked <?php }?> /> </td> </tr>
+                <tr> <td> Priority </td> <td> <input type="checkbox" name="priority" <?php if($u->getPreference('pmdisplay:priority')){ ?> checked <?php }?>  /> </td> </tr>
+                <tr> <td> Status</td> <td> <input type="checkbox" name="status" <?php if($u->getPreference('pmdisplay:status')){ ?> checked <?php }?>  /> </td> </tr>
+                <!-- <tr> <td> Project Task Id </td> <td> <input type="checkbox" name="projectTaskId" <?php if($u->getPreference('pmdisplay:projectTaskId')){ ?> checked <?php }?>  /> </td> </tr> -->
+                <tr> <td> Real Name </td> <td> <input type="checkbox" name="realName" <?php if($u->getPreference('pmdisplay:realName')){ ?> checked <?php }?>  /> </td> </tr>
+                <tr> <td> Duration </td> <td> <input type="checkbox" name="duration" <?php if($u->getPreference('pmdisplay:duration')){ ?> checked <?php }?> /> </td> </tr>
+                <tr> <td> Parent Id </td> <td> <input type="checkbox" name="parentId" <?php if($u->getPreference('pmdisplay:parentId')){ ?> checked <?php }?>  /> </td> </tr>
+                <tr> <td> User Name </td> <td> <input type="checkbox" name="userName" <?php if($u->getPreference('pmdisplay:userName')){ ?> checked <?php }?>  /> </td> </tr>
+                <tr> <td> Details </td> <td> <input type="checkbox" name="details" <?php if($u->getPreference('pmdisplay:details')){ ?> checked <?php }?>  /> </td> </tr>
+                <tr> <td> Hours </td> <td> <input type="checkbox" name="hours"  <?php if($u->getPreference('pmdisplay:hours')){ ?> checked <?php }?>/> </td> </tr>
+                <tr> <td> Status Id </td> <td> <input type="checkbox" name="statusId" <?php if($u->getPreference('pmdisplay:statusId')){ ?> checked <?php }?> /> </td> </tr>
+                <tr> <td> Category Id </td> <td> <input type="checkbox" name="categoryId"  <?php if($u->getPreference('pmdisplay:categoryId')){ ?> checked <?php }?>/> </td> </tr>
+                <tr> <td> Category Name </td> <td> <input type="checkbox" name="categoryName" <?php if($u->getPreference('pmdisplay:categoryName')){ ?> checked <?php }?> /> </td> </tr>
+                <tr> <td> Last Modified Date </td> <td> <input type="checkbox" name="lastModifiedDate" <?php if($u->getPreference('pmdisplay:lastModifiedDate')){ ?> checked <?php }?>  /> </td> </tr>
+				<tr> <td> External Id </td> <td> <input type="checkbox" name="externalId" <?php if($u->getPreference('pmdisplay:externalId')){ ?> checked <?php }?>  /> </td> </tr>
+				<tr> <td> Sub-Project </td> <td> <input type="checkbox" name="sub_project_name" <?php if($u->getPreference('pmdisplay:sub_project_name')){ ?> checked <?php }?>  /> </td> </tr>
                 <tr> <td colspan="2">&nbsp;</tr>
                 <tr> <td> Select/Deselect All: </td> <td> <input type="checkbox" name="selectDeselect" onclick="selectDeselectAllCheckFields(this);" /> </td> </tr>
 		</table>



More information about the evolvis-commits mailing list