Peter M. Groen / knowledgetree

Commit 3f4be53144c7b1bfc86220f577699b348d5ec3b5

Authored by Michael Joseph
1 parent e37f67a9

(#2988) removed active field from UI. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2713 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 12 additions and 15 deletions
presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleUI.inc
  View file @3f4be53
@@ -30,16 +30,16 @@ function getCreatePage($iRoleID) { @@ -30,16 +30,16 @@ function getCreatePage($iRoleID) {
30 global $default; 30 global $default;
31 31
32 $sQuery = "SELECT * FROM $default->roles_table WHERE id = $iRoleID"; 32 $sQuery = "SELECT * FROM $default->roles_table WHERE id = $iRoleID";
33 - $aDisplayColumns = array("name","active","can_read","can_write");  
34 - $aStoreColumns = array("name","active", "can_read","can_write");  
35 - $aColumnNames = array("Name:","Active:", "Readable:", "Writable:");  
36 - $aDisplayColumnTypes = array(1,2,2,2);  
37 - $aDatabaseColumnTypes = array(1,2,2,2); 33 + $aDisplayColumns = array("name", "can_read", "can_write");
  34 + $aStoreColumns = array("name", "can_read","can_write");
  35 + $aColumnNames = array("Name", "Read", "Write");
  36 + $aDisplayColumnTypes = array(1,2,2);
  37 + $aDatabaseColumnTypes = array(1,2,2);
38 38
39 // get list of role properties...name...text field...is_Sys_admin and is_unit_admin..checkboxes 39 // get list of role properties...name...text field...is_Sys_admin and is_unit_admin..checkboxes
40 $oPattern = & new PatternEditableListFromQuery($sQuery, $default->roles_table, $aDisplayColumns, $aStoreColumns, $aColumnNames, $aDisplayColumnTypes, $aDatabaseColumnTypes) ; 40 $oPattern = & new PatternEditableListFromQuery($sQuery, $default->roles_table, $aDisplayColumns, $aStoreColumns, $aColumnNames, $aDisplayColumnTypes, $aDatabaseColumnTypes) ;
41 $oPattern->setUniqueName("roleEdit"); 41 $oPattern->setUniqueName("roleEdit");
42 - $oPattern->setColumnsRequired(array(1,0,0,0)); 42 + $oPattern->setColumnsRequired(array(1,0,0));
43 43
44 $sToRender .= renderHeading("Edit Role"); 44 $sToRender .= renderHeading("Edit Role");
45 $sToRender .= "<table>\n"; 45 $sToRender .= "<table>\n";
@@ -100,9 +100,6 @@ function getEditPage($iRoleID) { @@ -100,9 +100,6 @@ function getEditPage($iRoleID) {
100 if (isset($iRoleID)) { 100 if (isset($iRoleID)) {
101 $sToRender .= "</tr>\n"; 101 $sToRender .= "</tr>\n";
102 $sToRender .= "<tr>\n"; 102 $sToRender .= "<tr>\n";
103 - $sToRender .= "<td>Active: </td><td>" . getActiveCheckBox($oRole) . "</td>\n";  
104 - $sToRender .= "</tr>\n";  
105 - $sToRender .= "<tr>\n";  
106 $sToRender .= "<td>Readable: </td><td>" . getReadableCheckBox($oRole) . "</td>\n"; 103 $sToRender .= "<td>Readable: </td><td>" . getReadableCheckBox($oRole) . "</td>\n";
107 $sToRender .= "</tr>\n"; 104 $sToRender .= "</tr>\n";
108 $sToRender .= "<tr>\n"; 105 $sToRender .= "<tr>\n";
presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesUI.inc
  View file @3f4be53
@@ -26,19 +26,19 @@ @@ -26,19 +26,19 @@
26 */ 26 */
27 function getRoles() { 27 function getRoles() {
28 global $default; 28 global $default;
29 - $sQuery = "SELECT id as roleID, name as name, active, can_read as reader, can_write as writer, " . 29 + $sQuery = "SELECT id as roleID, name as name, can_read as reader, can_write as writer, " .
30 "'Edit', 'Delete' " . 30 "'Edit', 'Delete' " .
31 "FROM roles " . 31 "FROM roles " .
32 "ORDER BY name"; 32 "ORDER BY name";
33 33
34 - $aColumns = array("name", "active", "reader", "writer", "Edit", "Delete");  
35 - $aColumnNames = array("Name", "Active", "Read", "Write", "Edit", "Delete");  
36 - $aColumnTypes = array(1,2,2,2,3,3); 34 + $aColumns = array("name", "reader", "writer", "Edit", "Delete");
  35 + $aColumnNames = array("Name", "Read", "Write", "Edit", "Delete");
  36 + $aColumnTypes = array(1,2,2,3,3);
37 $aDBColumnArray = array("roleID"); 37 $aDBColumnArray = array("roleID");
38 $aQueryStringVariableNames = array("fRoleID"); 38 $aQueryStringVariableNames = array("fRoleID");
39 39
40 - $aHyperLinkURL = array( 4=> "$default->rootUrl/control.php?action=editRole",  
41 - 5=> "$default->rootUrl/control.php?action=removeRole"); //"$default->rootUrl/control.php?action=removeUserFromGroup"); 40 + $aHyperLinkURL = array( 3=> "$default->rootUrl/control.php?action=editRole",
  41 + 4=> "$default->rootUrl/control.php?action=removeRole"); //"$default->rootUrl/control.php?action=removeUserFromGroup");
42 42
43 $oSearchResults = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnNames, "100%", $aHyperLinkURL,$aDBColumnArray,$aQueryStringVariableNames); 43 $oSearchResults = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnNames, "100%", $aHyperLinkURL,$aDBColumnArray,$aQueryStringVariableNames);
44 $oSearchResults->setDisplayColumnHeadings(true); 44 $oSearchResults->setDisplayColumnHeadings(true);