diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleUI.inc
index 8b58ec7..1e7e165 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleUI.inc
@@ -30,16 +30,16 @@ function getCreatePage($iRoleID) {
global $default;
$sQuery = "SELECT * FROM $default->roles_table WHERE id = $iRoleID";
- $aDisplayColumns = array("name","active","can_read","can_write");
- $aStoreColumns = array("name","active", "can_read","can_write");
- $aColumnNames = array("Name:","Active:", "Readable:", "Writable:");
- $aDisplayColumnTypes = array(1,2,2,2);
- $aDatabaseColumnTypes = array(1,2,2,2);
+ $aDisplayColumns = array("name", "can_read", "can_write");
+ $aStoreColumns = array("name", "can_read","can_write");
+ $aColumnNames = array("Name", "Read", "Write");
+ $aDisplayColumnTypes = array(1,2,2);
+ $aDatabaseColumnTypes = array(1,2,2);
// get list of role properties...name...text field...is_Sys_admin and is_unit_admin..checkboxes
$oPattern = & new PatternEditableListFromQuery($sQuery, $default->roles_table, $aDisplayColumns, $aStoreColumns, $aColumnNames, $aDisplayColumnTypes, $aDatabaseColumnTypes) ;
$oPattern->setUniqueName("roleEdit");
- $oPattern->setColumnsRequired(array(1,0,0,0));
+ $oPattern->setColumnsRequired(array(1,0,0));
$sToRender .= renderHeading("Edit Role");
$sToRender .= "
\n";
@@ -100,9 +100,6 @@ function getEditPage($iRoleID) {
if (isset($iRoleID)) {
$sToRender .= "\n";
$sToRender .= "\n";
- $sToRender .= "| Active: | " . getActiveCheckBox($oRole) . " | \n";
- $sToRender .= "
\n";
- $sToRender .= "\n";
$sToRender .= "| Readable: | " . getReadableCheckBox($oRole) . " | \n";
$sToRender .= "
\n";
$sToRender .= "\n";
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesUI.inc
index 8327630..435d94d 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesUI.inc
@@ -26,19 +26,19 @@
*/
function getRoles() {
global $default;
- $sQuery = "SELECT id as roleID, name as name, active, can_read as reader, can_write as writer, " .
+ $sQuery = "SELECT id as roleID, name as name, can_read as reader, can_write as writer, " .
"'Edit', 'Delete' " .
"FROM roles " .
"ORDER BY name";
- $aColumns = array("name", "active", "reader", "writer", "Edit", "Delete");
- $aColumnNames = array("Name", "Active", "Read", "Write", "Edit", "Delete");
- $aColumnTypes = array(1,2,2,2,3,3);
+ $aColumns = array("name", "reader", "writer", "Edit", "Delete");
+ $aColumnNames = array("Name", "Read", "Write", "Edit", "Delete");
+ $aColumnTypes = array(1,2,2,3,3);
$aDBColumnArray = array("roleID");
$aQueryStringVariableNames = array("fRoleID");
- $aHyperLinkURL = array( 4=> "$default->rootUrl/control.php?action=editRole",
- 5=> "$default->rootUrl/control.php?action=removeRole"); //"$default->rootUrl/control.php?action=removeUserFromGroup");
+ $aHyperLinkURL = array( 3=> "$default->rootUrl/control.php?action=editRole",
+ 4=> "$default->rootUrl/control.php?action=removeRole"); //"$default->rootUrl/control.php?action=removeUserFromGroup");
$oSearchResults = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnNames, "100%", $aHyperLinkURL,$aDBColumnArray,$aQueryStringVariableNames);
$oSearchResults->setDisplayColumnHeadings(true);