From 5ebf4e59125be860c8adcc5c6b395c9f0021d3da Mon Sep 17 00:00:00 2001 From: Brad Shuttleworth Date: Wed, 23 Nov 2005 10:49:24 +0000 Subject: [PATCH] - add org admin, unit admin. - hide org admin - improve group-admin to allow editing of unit link - add UnitLink utilities to class Group --- lib/groups/Group.inc | 41 +++++++++++++++++++++++++++++++++++++++++ plugins/ktcore/KTAdminPlugins.php | 2 ++ presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupBL.php | 89 ----------------------------------------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupFail.php | 64 ---------------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php | 58 ---------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUI.inc | 253 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/groupManagement.php | 27 +++++++++++++++++++++++++++ presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php | 48 ------------------------------------------------ presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php | 62 -------------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc | 59 ----------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgBL.php | 76 ---------------------------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc | 129 --------------------------------------------------------------------------------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/listOrgBL.php | 49 ------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/listOrgUI.inc | 59 ----------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/orgManagement.php | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgBL.php | 71 ----------------------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc | 127 ------------------------------------------------------------------------------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php | 96 ------------------------------------------------------------------------------------------------ presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitToOrgBL.php | 110 -------------------------------------------------------------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitToOrgUI.inc | 223 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc | 166 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitBL.php | 76 ---------------------------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitOrgBL.php | 66 ------------------------------------------------------------------ presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitOrgUI.inc | 224 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitUI.inc | 123 --------------------------------------------------------------------------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsBL.php | 48 ------------------------------------------------ presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsUI.inc | 78 ------------------------------------------------------------------------------ presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php | 102 ------------------------------------------------------------------------------------------------------ presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitFromOrgBL.php | 121 ------------------------------------------------------------------------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitFromOrgUI.inc | 231 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitUI.inc | 115 ------------------------------------------------------------------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/unitManagement.php | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ templates/kt3/fields/lookup.smarty | 2 +- templates/ktcore/principals/groupadmin.smarty | 5 ++--- templates/ktcore/principals/orgadmin.smarty | 44 ++++++++++++++++++++++++++++++++++++++++++++ templates/ktcore/principals/unitadmin.smarty | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 36 files changed, 341 insertions(+), 2927 deletions(-) delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupBL.php delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupFail.php delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUI.inc delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgBL.php delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/listOrgBL.php delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/listOrgUI.inc create mode 100644 presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/orgManagement.php delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgBL.php delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitToOrgBL.php delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitToOrgUI.inc delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitBL.php delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitOrgBL.php delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitOrgUI.inc delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitUI.inc delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsBL.php delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsUI.inc delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitFromOrgBL.php delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitFromOrgUI.inc delete mode 100644 presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitUI.inc create mode 100644 presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/unitManagement.php create mode 100644 templates/ktcore/principals/orgadmin.smarty create mode 100644 templates/ktcore/principals/unitadmin.smarty diff --git a/lib/groups/Group.inc b/lib/groups/Group.inc index 08eadfa..81f693c 100644 --- a/lib/groups/Group.inc +++ b/lib/groups/Group.inc @@ -24,6 +24,10 @@ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa * @package lib.groups */ + +require_once(KT_LIB_DIR . '/groups/GroupUnitLink.inc'); +require_once(KT_LIB_DIR . '/unitmanagement/Unit.inc'); + class Group extends KTEntity { /** primary key of current object */ @@ -117,6 +121,43 @@ class Group extends KTEntity { } } + function _getUnitLink() { + $oldUnitLink = GroupUnitLink::getList('group_id = ' . $this->getID()); + if (count($oldUnitLink) != 0) { + return $oldUnitLink[0]; + } else { + return null; + } + } + + function setUnit($iUnitId) { + if ($this->hasUnit()) { + $oldUnitLink = $this->_getUnitLink(); + $oldUnitLink->setUnitID($iUnitId); + $oldUnitLink->update(); + } else { + $unitLink = new GroupUnitLink($this->iId, $iUnitId); + $unitLink->create(); + } + } + + function clearUnit() { + $oLink = $this->_getUnitLink(); + if ($oLink !== null) { + $oLink->delete(); + } + } + + function getUnit() { + $oLink = $this->_getUnitLink(); + if ($oLink !== null) { + $oUnit = Unit::get($oLink->getUnitID()); + return $oUnit; + } else { + return null; + } + } + /** * Static function. * Given a groups primary key it will create a diff --git a/plugins/ktcore/KTAdminPlugins.php b/plugins/ktcore/KTAdminPlugins.php index e87a4e5..403d443 100644 --- a/plugins/ktcore/KTAdminPlugins.php +++ b/plugins/ktcore/KTAdminPlugins.php @@ -28,6 +28,8 @@ $oAdminRegistry->registerCategory("misc", "Miscellaneous", "Various settings whi // users and groups $oAdminRegistry->registerLocation("users",'KTUserAdminDispatcher',"principals", "Manage Users","Add or remove users from the system.", KT_DIR . '/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/userManagement.php', null); $oAdminRegistry->registerLocation("groups",'KTGroupAdminDispatcher',"principals", "Manage Groups","Add or remove groups from the system.", KT_DIR . '/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/groupManagement.php', null); +$oAdminRegistry->registerLocation("units",'KTUnitAdminDispatcher',"principals", "Control Units","Specify which organisation units are available.", KT_DIR . '/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/unitManagement.php', null); +//$oAdminRegistry->registerLocation("orgs",'KTOrgAdminDispatcher',"principals", "Control Organisations","Specify which organisations are available.", KT_DIR . '/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/orgManagement.php', null); // documents $oAdminRegistry->registerLocation("typemanagement",'KTDocumentTypeDispatcher','documents', 'Document Types','Manage the different classes of document which can be added to the system.', KT_DIR . '/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/documentTypes.php', null); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupBL.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupBL.php deleted file mode 100644 index 0e81bcc..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupBL.php +++ /dev/null @@ -1,89 +0,0 @@ -fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc"); - require_once("editGroupUI.inc"); - require_once("$default->fileSystemRoot/lib/security/Permission.inc"); - require_once("$default->fileSystemRoot/lib/groups/Group.inc"); - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); - require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); - require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); - require_once("$default->fileSystemRoot/presentation/Html.inc"); - - - $oPatternCustom = & new PatternCustom(); - - // if a new group has been added - if (isset($fFromCreate)) { - - if($fGroupID == -1) { - $oPatternCustom->setHtml(getAddFailPage()); - } else { - $oPatternCustom->setHtml(getCreatePage($fGroupID)); - } - - $_SESSION["pageAccess"][$default->rootUrl . '/presentation/lookAndFeel/knowledgeTree/store.php'] = true; - $main->setFormAction("$default->rootUrl/presentation/lookAndFeel/knowledgeTree/store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=editGroupSuccess")); - - // coming from manual edit page - } else if (isset($fForStore)) { - $oGroup = Group::get($fGroupID); - $oGroup->setName($fGroupName); - - //check if checkbox checked - $oGroup->setUnitAdmin(isset($fGroupUnitAdmin)); - //check if checkbox checked - $oGroup->setSysAdmin(isset($fGroupSysAdmin)); - - if ($oGroup->update()) { - // if successfull print out success message - $oPatternCustom->setHtml(getEditPageSuccess()); - } else { - // if fail print out fail message - $oPatternCustom->setHtml(getEditPageFail()); - } - } else if (isset($fGroupID)) { - // post back on group select from manual edit page - $oPatternCustom->setHtml(getEditPage($fGroupID)); - $main->setFormAction($_SERVER["PHP_SELF"] . "?fForStore=1"); - } else { - // if nothing happens...just reload edit page - $oPatternCustom->setHtml(getEditPage(null)); - $main->setFormAction($_SERVER["PHP_SELF"]); - } - //render the page - $main->setCentralPayload($oPatternCustom); - $main->render(); -} -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupFail.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupFail.php deleted file mode 100644 index 6c25e27..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupFail.php +++ /dev/null @@ -1,64 +0,0 @@ -fileSystemRoot/presentation/webpageTemplate.inc"); - - -$Center = "

\n" ; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "
" . _("Deletion Failed!") . "
" . _("Please Ensure that The Group has been Removed from any Unit it belongs to") . "
rootUrl/control.php?action=editGroup\">
\n"; - - -$oPatternCustom = & new PatternCustom(); -$oPatternCustom->setHtml($Center); -$main->setCentralPayload($oPatternCustom); -$main->render(); - - - - -} - -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php deleted file mode 100644 index 1d2b185..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php +++ /dev/null @@ -1,58 +0,0 @@ -fileSystemRoot/presentation/Html.inc"); - -global $default; - -if (checkSession()) { - - // include the page template (with navbar) - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - - $Center .= renderHeading(_("Edit Group")); - $Center .= "\n"; - $Center .= "\n"; - $Center .= "\n"; - $Center .= "\n"; - $Center .= "\n"; - $Center .= "\n"; - $Center .= "\n"; - $Center .= "\n"; - $Center .= "\n"; - $Center .= "\n"; - $Center .= "\n"; - $Center .= "
" . _("Update Successful!") . "
rootUrl/control.php?action=listGroups\">
\n"; - - $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml($Center); - $main->setCentralPayload($oPatternCustom); - $main->render(); -} -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUI.inc deleted file mode 100644 index 1ff3a77..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUI.inc +++ /dev/null @@ -1,253 +0,0 @@ -groups_table WHERE id = ?", $iGroupID); - // #2978 if you're not a system administrator, you can't add a sys admin group - // FIXME: there must be a more elegant way to do this? possibly some exclusions to the pattern - if (Permission::userIsSystemAdministrator()) { - $aDisplayColumns = array("name","is_sys_admin","is_unit_admin"); - $aStoreColumns = array("name","is_sys_admin","is_unit_admin"); - $aColumnNames = array(_("Name") . ":", _("System Administrator") . ":", _("Unit Administrator") . ":"); - $aDisplayColumnTypes = array(1,2,2); - $aDatabaseColumnTypes = array(1,2,2); - } else { - $aDisplayColumns = array("name","is_unit_admin"); - $aStoreColumns = array("name","is_unit_admin"); - $aColumnNames = array(_("Name") . ":", _("Unit Administrator") . ":"); - $aDisplayColumnTypes = array(1,2); - $aDatabaseColumnTypes = array(1,2); - } - - // get list of group properties...name...text field...is_Sys_admin and is_unit_admin..checkboxes - $oPattern = & new PatternEditableListFromQuery($sQuery, $default->groups_table, $aDisplayColumns, $aStoreColumns, $aColumnNames, $aDisplayColumnTypes, $aDatabaseColumnTypes); - $oPattern->setUniqueName("groupEdit"); - $oPattern->setColumnsRequired(array(1,0,0)); - - $sToRender .= renderHeading(_("Add Group Properties")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - - $sToRender .= "\n"; - $sToRender .= "
" . $oPattern->render() . "
\n"; - return $sToRender; -} - - -// if fails .. -function getAddFailPage() { - - global $default; - - $sToRender .= renderHeading(_("Edit Group Properties")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Add Group Failed") . ":
" . _("Sorry, Group Already Exists!") . "
rootUrl/control.php?action=listGroups\">
\n"; - - return $sToRender; - -} - -// if its the manual edit page..then display normally -function getEditPage($iGroupID) { - global $default; - $oGroup = null; - if (isset($iGroupID)) { - $oGroup = Group::get($iGroupID); - - } - - $sToRender .= renderHeading(_("Edit Group Properties")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - - // if a group selected...show checkboxes - if (isset($iGroupID)) { - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - if (Permission::userIsSystemAdministrator()) { - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - } - $sToRender .= "\n"; - $sToRender .= "\n"; - } - - - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "" . getUpdateButton($oGroup); - $sToRender .= getCancelButton($oGroup); - $sToRender .= "
" . _("Group Name") . ": " . getGroupDisplay($oGroup) . "
" . _("Unit Administrator") . ": " . getUnitAdminCheckBox($oGroup) . "
" . _("System Administrator") . ": " . getSysAdminCheckBox($oGroup) . "
\n"; - - - return $sToRender; -} - -// if edition is successful print otu success page -function getEditPageSuccess() { - global $default; - - $sToRender .= renderHeading(_("Edit Group Properties")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Success") . "!
" . _("The Group was successfully modified") . "
rootUrl/control.php?action=listGroups\">
\n"; - - - return $sToRender; -} - - -// gets the page if edition fails -function getEditPageFail() { - global $default; - - $sToRender .= renderHeading(_("Edit Group Properties")); - - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Failure") . "!
" . _("The Group modification Failed!") . "
rootUrl/control.php?action=listGroups\">
\n"; - - - return $sToRender; -} - -// show the list box when no group selected -// then shows a text box with the group's name -function getGroupDisplay($oGroup) { - global $default; - if (!isset($oGroup)) { - if (Permission::userIsSystemAdministrator()) { - // if this is the system administrator, prepend group names with unit name - $oPatternListBox = & new PatternListBox($default->groups_table, "name", "id", "fGroupID"); - $oPatternListBox->setFromClause("LEFT OUTER JOIN groups_units_link GUL on ST.id=GUL.group_id " . - "LEFT OUTER JOIN units_lookup UL on GUL.unit_id=UL.id"); - $oPatternListBox->setCompositeDisplayName("DISTINCT COALESCE(CONCAT(CONCAT(UL.name, '-'),ST.name),ST.name)"); - } else if (Permission::userIsUnitAdministrator()) { - // else if this is a unit administrator, only display the groups in your unit - $oPatternListBox = & new PatternListBox($default->groups_table, "name", "id", "fGroupID"); - $oPatternListBox->setFromClause("INNER JOIN $default->groups_units_table GUL on ST.id=GUL.group_id"); - $oPatternListBox->setWhereClause("GUL.unit_id=" . User::getUnitID($_SESSION["userID"])); - - $oUnassignedUsersLB = & new PatternListBox($default->groups_table, "name", "id", "fGroupID"); - $oUnassignedUsersLB->setFromClause("LEFT OUTER JOIN $default->groups_units_table GUL ON ST.id=GUL.group_id"); - $oUnassignedUsersLB->setWhereClause("ISNULL(GUL.unit_id) AND ST.name <> 'Anonymous' AND ST.name <> 'System Administrators'"); - $oPatternListBox->setAdditionalEntries($oUnassignedUsersLB->getEntries()); - } - - $oPatternListBox->setPostBackOnChange(true); - return $oPatternListBox->render(); - } else { - return "iId . "\">\n" . - "getName() . "\">"; - } - -} - - -// returns the checkbox ticked or unticked -function getUnitAdminCheckBox($oGroup) { - if (!isset($oGroup)) { - return ""; - } else { - return "getUnitAdmin() ? "CHECKED " : " ") . " />"; - } -} - -// returns the checkbox ticked or unticked -function getSysAdminCheckBox($oGroup) { - if (!isset($oGroup)) { - return ""; - } else { - return "getSysAdmin() ? "CHECKED " : " ") . " />"; - } - -} - -// gets the updatebutton when a group is selected -function getUpdateButton($oGroup) { - global $default; - if (!isset($oGroup)) { - return _("Please select a Group") . ": "; - } else { - return "\n"; - } -} - -// gets the cancel button when a group is selected -function getCancelButton($oGroup) { - global $default; - if (!isset($oGroup)) { - return "rootUrl/control.php?action=groupManagement\">\n"; - } else { - return "rootUrl/control.php?action=listGroups\">\n"; - } -} -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/groupManagement.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/groupManagement.php index 1743e6d..4a648b8 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/groupManagement.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/groupManagement.php @@ -5,6 +5,7 @@ require_once(KT_LIB_DIR . '/users/User.inc'); require_once(KT_LIB_DIR . '/groups/GroupUtil.php'); require_once(KT_LIB_DIR . '/groups/Group.inc'); +require_once(KT_LIB_DIR . '/unitmanagement/Unit.inc'); require_once(KT_LIB_DIR . "/templating/templating.inc.php"); require_once(KT_LIB_DIR . "/dispatcher.inc.php"); @@ -66,6 +67,20 @@ class KTGroupAdminDispatcher extends KTAdminDispatcher { $edit_fields[] = new KTStringWidget('Group Name','A short name for the group. e.g. administrators.', 'group_name', $oGroup->getName(), $this->oPage, true); $edit_fields[] = new KTCheckboxWidget('Unit Administrators','Should all the members of this group be given unit administration privilidges?', 'is_unitadmin', $oGroup->getUnitAdmin(), $this->oPage, false); $edit_fields[] = new KTCheckboxWidget('System Administrators','Should all the members of this group be given system administration privilidges?', 'is_sysadmin', $oGroup->getSysAdmin(), $this->oPage, false); + + // grab all units. + $unit = $oGroup->getUnit(); + if ($unit == null) { $unitId = 0; } + else { $unitId = $unit->getID(); } + + + $oUnits = Unit::getList(); + $vocab = array(); + $vocab[0] = 'No Unit'; + foreach ($oUnits as $oUnit) { $vocab[$oUnit->getID()] = $oUnit->getName(); } + $aOptions = array('vocab' => $vocab); + + $edit_fields[] = new KTLookupWidget('Unit','Which Unit is this group part of?', 'unit_id', $unitId, $this->oPage, false, null, null, $aOptions); $oTemplating = new KTTemplating; $oTemplate = $oTemplating->loadTemplate("ktcore/principals/editgroup"); @@ -96,6 +111,12 @@ class KTGroupAdminDispatcher extends KTAdminDispatcher { $oGroup->setUnitAdmin($is_unitadmin); $oGroup->setSysAdmin($is_sysadmin); + $unit_id = KTUtil::arrayGet($_REQUEST, 'unit_id', 0); + if ($unit_id == 0) { // not set, or set to 0. + $oGroup->clearUnit(); // safe. + } else { + $oGroup->setUnit($unit_id); + } $res = $oGroup->update(); if (($res == false) || (PEAR::isError($res))) { return $this->errorRedirectToMain('Failed to set group details.'); } @@ -256,6 +277,12 @@ class KTGroupAdminDispatcher extends KTAdminDispatcher { return $oTemplate->render($aTemplateData); } + function _getUnitName($oGroup) { + $u = $oGroup->getUnit(); + + return $u->getName(); + } + // FIXME copy-paste ... function do_updateGroupMembers() { $group_id = KTUtil::arrayGet($_REQUEST, 'group_id'); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php deleted file mode 100644 index c349b81..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php +++ /dev/null @@ -1,48 +0,0 @@ -fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); -require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc"); -require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc"); -require_once("$default->fileSystemRoot/lib/security/Permission.inc"); -require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); -require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); -require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); -require_once("$default->fileSystemRoot/presentation/Html.inc"); -require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc"); -require_once("addOrgUI.inc"); - -if (checkSession()) { - $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getPage()); - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - $main->setCentralPayload($oPatternCustom); - $main->setFormAction("$default->rootUrl/presentation/lookAndFeel/knowledgeTree/create.php?fRedirectURL=".urlencode("$default->rootUrl/control.php?action=addOrgSuccess&fedit=1")); - $main->setHasRequiredFields(true); - $main->render(); -} -?> \ No newline at end of file diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php deleted file mode 100644 index bcf38d8..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php +++ /dev/null @@ -1,62 +0,0 @@ -fileSystemRoot/presentation/webpageTemplate.inc"); - - $sToRender .= renderHeading(_("Add Organisation")); - $sToRender .= "\n"; - $sToRender .= "\n"; - if($fSuccess) { - $sToRender .= "\n"; - } else { - $sToRender .= "\n"; - } - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Organisation added Successfully!") . "" . _("Organisation not added. Organisation may already exist!") . "
rootUrl/control.php?action=listOrg\">
\n"; - - $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml($sToRender); - $main->setCentralPayload($oPatternCustom); - $main->render(); -} -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc deleted file mode 100644 index 5e1b6c8..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc +++ /dev/null @@ -1,59 +0,0 @@ -setUniqueName("organisation"); - - $sToRender .= renderHeading(_("Add Organisation")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . $oPatternCreate->render() . "
"; - $sToRender .= getCancelButton("listOrg") . "
\n"; - - return $sToRender; - - - -} -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgBL.php deleted file mode 100644 index c16d735..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgBL.php +++ /dev/null @@ -1,76 +0,0 @@ -fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc"); - require_once("editOrgUI.inc"); - require_once("$default->fileSystemRoot/lib/security/Permission.inc"); - require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.inc"); - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); - require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); - require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); - require_once("$default->fileSystemRoot/presentation/Html.inc"); - - - $oPatternCustom = & new PatternCustom(); - - // if a new Org has been added - // coming from manual edit page - if (isset($fForStore)) { - $oOrg = Organisation::get($fOrgID); - $oOrg->setName($fOrgName); - - if ($oOrg->update()) { - // if successfull print out success message - $oPatternCustom->setHtml(getEditPageSuccess()); - - } else { - // if fail print out fail message - $oPatternCustom->setHtml(getEditPageFail()); - } - } else if (isset($fOrgID)){ - // post back on Org select from manual edit page - $oPatternCustom->setHtml(getEditPage($fOrgID)); - $main->setFormAction($_SERVER["PHP_SELF"] . "?fForStore=1"); - - - } else { - // if nothing happens...just reload edit page - $oPatternCustom->setHtml(getEditPage(null)); - $main->setFormAction($_SERVER["PHP_SELF"]); - - } - //render the page - $main->setCentralPayload($oPatternCustom); - $main->render(); -} -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc deleted file mode 100644 index cf4db9d..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc +++ /dev/null @@ -1,129 +0,0 @@ -\n"; - $sToRender .= "" . _("Please select an Organisation") . ":\n"; - $sToRender .= "\n"; - $sToRender .= "" . _("Organisation Name") . ": " . getOrgDisplay($oOrg) . "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "" . getUpdateButton($oOrg); - $sToRender .= getCancelButton($oOrg); - $sToRender .= "\n"; - - return $sToRender; -} - -// if edition is successful print otu success page -function getEditPageSuccess() { - global $default; - - $sToRender .= renderHeading(_("Edit Organisation")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Success") . "!
" . _("The Organisation was successfully modified") . "
rootUrl/control.php?action=listOrg\">
\n"; - - - return $sToRender; -} - - -// gets the page if edition fails -function getEditPageFail() { - global $default; - - $sToRender .= renderHeading(_("Edit Organisation")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . strtoupper(_("Failure")) . "!
" . _("Organisation modification Failed!") . "
rootUrl/control.php?action=listOrg\">
\n"; - - - return $sToRender; -} - -// show the list box when no Org selected -// then shows a text box with the Org's name -function getOrgDisplay($oOrg) { - global $default; - if (!isset($oOrg)) { - $oPatternListBox = & new PatternListBox($default->organisations_table, "name", "id", "fOrgID"); - //$oPatternListBox->setIncludeDefaultValue(true); - $oPatternListBox->setPostBackOnChange(true); - return $oPatternListBox->render(); - } else { - return "iId . "\">\n" . - "getName() . "\">"; - } - -} - - -// gets the updatebutton when a Org is selected -function getUpdateButton($oOrg) { - global $default; - if (isset($oOrg)) { - return "\n"; - } -} - -// gets the cancel button when a Org is selected -function getCancelButton($oOrg) { - global $default; - if (!isset($oOrg)) { - return "rootUrl/control.php?action=orgManagement\">\n"; - } else { - return "rootUrl/control.php?action=listOrg\">\n"; - } -} -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/listOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/listOrgBL.php deleted file mode 100644 index 4efc203..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/listOrgBL.php +++ /dev/null @@ -1,49 +0,0 @@ -fileSystemRoot/lib/users/User.inc"); -require_once("$default->fileSystemRoot/lib/security/Permission.inc"); -require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); -require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc"); -require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); -require_once("$default->fileSystemRoot/presentation/Html.inc"); -require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc"); -require_once("listOrgUI.inc"); - -if (checkSession()) { - $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getPage($fGroupID)); - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - $main->setCentralPayload($oPatternCustom); - $main->setFormAction($_SERVER['PHP_SELF']); - $main->render(); -} -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/listOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/listOrgUI.inc deleted file mode 100644 index ecfdb83..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/listOrgUI.inc +++ /dev/null @@ -1,59 +0,0 @@ - "$default->rootUrl/control.php?action=editOrg"); - //2=> "$default->rootUrl/control.php?action=removeOrg"); - $oSearchResults = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnNames, "100%", $aHyperLinkURL,$aDBColumnArray,$aQueryStringVariableNames); - $oSearchResults->setDisplayColumnHeadings(true); - return $oSearchResults->render() ; -} - -function getPage() { - global $default; - $sToRender .= renderHeading(_("Organisation Management")); - - // add user link - //$sToRender .= getAddLink("addOrg", "Add An Organisation"); - $sToRender .= getOrganisations(); - return $sToRender; -} -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/orgManagement.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/orgManagement.php new file mode 100644 index 0000000..b216b22 --- /dev/null +++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/orgManagement.php @@ -0,0 +1,78 @@ + 'administration', 'name' => 'Administration'), + ); + + function do_main() { + $this->aBreadcrumbs[] = array('action' => 'orgManagement', 'name' => 'Org Management'); + $this->oPage->setBreadcrumbDetails('select a organisation'); + $this->oPage->setTitle("Organisation Management"); + + $org_id= KTUtil::arrayGet($_REQUEST, 'org_id', null); + if ($org_id === null) { $for_edit = false; } + else { $for_edit = true; } + + $org_list =& Organisation::getList(); + + $edit_fields = array(); + $edit_org = null; + if ($for_edit === true) { + $oOrg = Organisation::get($org_id); + if (PEAR::isError($oOrg) || ($oOrg == false)) { $this->errorRedirectToMain('Invalid Organisation'); } + $edit_fields[] = new KTStringWidget('Organisation Name','The organisation\'s visible name. e.g. Tech Support', 'name', $oOrg->getName(), $this->oPage, true); + } + + $oTemplating = new KTTemplating; + $oTemplate = $oTemplating->loadTemplate("ktcore/principals/orgadmin"); + $aTemplateData = array( + "context" => $this, + "for_edit" => $for_edit, + "edit_fields" => $edit_fields, + "edit_org" => $oOrg, + "org_list" => $org_list, + ); + return $oTemplate->render($aTemplateData); + } + + function do_updateOrg() { + $org_id = KTUtil::arrayGet($_REQUEST, 'org_id'); + $oOrg = Organisation::get($org_id); + if (PEAR::isError($oOrg) || ($oOrg == false)) { + $this->errorRedirectToMain('Please specify an organisation.'); + exit(0); + } + + $org_name = KTUtil::arrayGet($_REQUEST, 'name', null); + if (empty($org_name)) { + $this->errorRedirectToMain('Please specify an org name.'); + exit(0); + } + + $this->startTransaction(); + $oOrg->setName($org_name); + $res = $oOrg->update(); + if (PEAR::isError($res)) { + $this->errorRedirectToMain('Failed to update org name.'); + exit(0); + } + + $this->commitTransaction(); + $this->successRedirectToMain('Org name changed to "' . $org_name . '"'); + } + +} + + +?> \ No newline at end of file diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgBL.php deleted file mode 100644 index 05f7234..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgBL.php +++ /dev/null @@ -1,71 +0,0 @@ -fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc"); - require_once("removeOrgUI.inc"); - require_once("$default->fileSystemRoot/lib/security/Permission.inc"); - require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.inc"); - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); - require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); - require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); - require_once("$default->fileSystemRoot/presentation/Html.inc"); - - $oPatternCustom = & new PatternCustom(); - - // get main page - if (isset($fOrgID)) { - $oPatternCustom->setHtml(getDeletePage($fOrgID)); - $main->setFormAction($_SERVER["PHP_SELF"] . "?fForDelete=1"); - // get delete page - } - else { - $oPatternCustom->setHtml(getDeletePage(null)); - $main->setFormAction($_SERVER["PHP_SELF"]); - } - - // if delete entry - if (isset($fForDelete)) { - $oOrg = Organisation::get($fOrgID); - $oOrg->setName($fOrgName); - - if ($oOrg->delete()) { - $oPatternCustom->setHtml(getDeleteSuccessPage()); - } else { - $oPatternCustom->setHtml(getDeleteFailPage()); - } - } - - $main->setCentralPayload($oPatternCustom); - $main->render(); -} -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc deleted file mode 100644 index 8c7e755..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc +++ /dev/null @@ -1,127 +0,0 @@ -" . _("Are you sure you wish to Remove this Organisation?") . "\n"; - } else { - $oOrg = null; - $sHeading .= _("Please select an Organisation") . ":"; - } - - $sToRender .= renderHeading(_("Remove Organisation")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= getDeleteButton($oOrg); - $sToRender .= "
$sHeading
" . _("Organisation Name") . ": " . getOrgDisplay($oOrg) . "
\n"; - - return $sToRender; -} - -// get successfully deletion page -function getDeleteSuccessPage() { - - global $default; - - $sToRender .= renderHeading(_("Remove Organisation")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Organisation Successfully Removed!") . "
rootUrl/control.php?action=listOrg\">
\n"; - - return $sToRender; -} - -// get deletion failed page -function getDeleteFailPage() { - - global $default; - - $sToRender .= renderHeading(_("Remove Organisation")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Deletion Failed!") . "
" . _("Please Ensure that ALL Units has been Removed the Organisation it belongs to") . "
rootUrl/control.php?action=listOrg\">
\n"; - - return $sToRender; -} - -// show listbox...or the text name -function getOrgDisplay($oOrg) { - global $default; - if (!isset($oOrg)) { - $oPatternListBox = & new PatternListBox($default->organisations_table, "name", "id", "fOrgID"); - $oPatternListBox->setIncludeDefaultValue(true); - $oPatternListBox->setPostBackOnChange(true); - return $oPatternListBox->render(); - } else { - return "iId . "\">\n" . - "" . $oOrg->getName() . ""; - } - -} - - -// show delete button -function getDeleteButton($oOrg) { - global $default; - if (isset($oOrg)) { - return "\n". - "rootUrl/control.php?action=listOrg\">\n"; - } -} -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php deleted file mode 100644 index 847db5d..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php +++ /dev/null @@ -1,96 +0,0 @@ -fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); -require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc"); -require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc"); -require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.inc"); -require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc"); -require_once("$default->fileSystemRoot/lib/security/Permission.inc"); -require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); -require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); -require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); -require_once("$default->fileSystemRoot/presentation/Html.inc"); -require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc"); -require_once("addUnitUI.inc"); - -if (checkSession()) { - - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - $oPatternCustom = & new PatternCustom(); - - if (isset($fFolderID)) { - - if (isset($fForStore)) { - if($fUnitName != "" and $fOrgID != "" and $fFolderID != "") { - // #2944 a folder will be created for this unit, so check if there is already a folder with the name - // of the unit before creating the unit - $oFolder = new Folder($fUnitName, $fUnitName . " " . _("Unit Root Folder"), $fFolderID, $_SESSION["userID"], 0); - if (!$oFolder->exists()) { - - $oUnit = new Unit($fUnitName, $fFolderID); - - // if creation is successfull..get the unit id - if ($oUnit->create()) { - $unitID = $oUnit->getID(); - $oUnitOrg = new UnitOrganisationLink($unitID,$fOrgID); - - if($oUnitOrg->create()) { - // if successfull print out success message - $oPatternCustom->setHtml(getAddPageSuccess()); - } else { - // if fail print out fail message - $oPatternCustom->setHtml(getAddToOrgFail()); - } - } else { - // if fail print out fail message - $oPatternCustom->setHtml(getAddPageFail(_("The Unit was not added. Unit Name Already exists!"))); - } - } else { - // #2944 failed with duplicate folder error message - $oPatternCustom->setHtml(getAddPageFail(_("The folder") . $fUnitName . _("already exists, please rename folder before creating this unit."))); - } - } else { - $oPatternCustom->setHtml(getPageFail()); - } - - } else { - // display add unit page - $oPatternCustom->setHtml(getAddPage()); - $oPatternCustom->addHtml(renderBrowsePage($fFolderID)); - $main->setHasRequiredFields(true); - $main->setFormAction($_SERVER["PHP_SELF"]. "?fForStore=1&fFolderID=$fFolderID"); - - } - $main->setCentralPayload($oPatternCustom); - $main->render(); - } -} -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitToOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitToOrgBL.php deleted file mode 100644 index 4cd2823..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitToOrgBL.php +++ /dev/null @@ -1,110 +0,0 @@ -fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc"); - require_once("addUnitToOrgUI.inc"); - require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc"); - require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc"); - require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.inc"); - require_once("$default->fileSystemRoot/lib/security/Permission.inc"); - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); - require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); - require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); - require_once("$default->fileSystemRoot/presentation/Html.inc"); - - $oPatternCustom = & new PatternCustom(); - - $oPatternCustom->addHtml(renderHeading(_("Add Unit to an Organisation"))); - - if (isset($fUnitID)) { - if ($fOrgID == "" && $fAdd == 1){ - $main->setErrorMessage(_("Select an Organisation")); - $main->setFormAction($_SERVER["PHP_SELF"] . "?fUnitID=$fUnitID&fAdd=1" ); - } - if ($fOrgID > 0) { - $oUnitOrgLink = & new UnitOrganisationLink($fUnitID,$fOrgID); - if ($oUnitOrgLink->create()) { - $oPatternCustom->addHtml(getAddSuccessPage()); - }else{ - $main->setErrorMessage(_("Unit cannot be linked to the Organisation.")); - $oPatternCustom->addHtml(getAddFailPage()); - } - } else{ - $oUnit = Unit::get($fUnitID); - $oPatternCustom->addHtml(getAddUnitsPage($oUnit)); - $main->setFormAction($_SERVER["PHP_SELF"] . "?fUnitID=$fUnitID&fAdd=1" ); - } - } - else { - - if (isset($fForStore)) { - if($fUnitName != "" and $fOrgID != "") { - $oUnit = new Unit($fUnitName); - - // if creation is successfull..get the unit id - if ($oUnit->create()) { - $unitID = $oUnit->getID(); - $oUnitOrg = new UnitOrganisationLink($unitID,$fOrgID); - - if($oUnitOrg->create()) { - // if successfull print out success message - $oPatternCustom->setHtml(getAddPageSuccess()); - } else { - // if fail print out fail message - $oPatternCustom->setHtml(getAddToOrgFail()); - } - } else { - // if fail print out fail message - $oPatternCustom->setHtml(getAddPageFail()); - } - } else { - $oPatternCustom->setHtml(getPageFail()); - } - - } else if (isset($fUnitID)) { - // post back on Unit select from manual edit page - $oPatternCustom->setHtml(getAddPage($fUnitID)); - $main->setFormAction($_SERVER["PHP_SELF"] . "?fForStore=1"); - } else { - // if nothing happens...just reload edit page - $oPatternCustom->setHtml(getAddPage(null)); - $main->setFormAction($_SERVER["PHP_SELF"]. "?fForStore=1"); - - } - - } - - $main->setCentralPayload($oPatternCustom); - $main->render(); -} -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitToOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitToOrgUI.inc deleted file mode 100644 index 0dc7450..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitToOrgUI.inc +++ /dev/null @@ -1,223 +0,0 @@ -\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - - $sToRender .= "rootUrl/control.php?action=listUnits\">\n"; - - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - return $sToRender; - -} -function getAddSuccessPage(){ - global $default; - - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
\n"; - - $sToRender .= _("Unit has been successfully added to the Organisation."). "\n"; - $sToRender .= "rootUrl/control.php?action=listUnits\">\n"; - - $sToRender .= "
\n"; - - return $sToRender; -} - - -function getAddUnitsPage($oUnit) { - global $default; - - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
\n"; - $sToRender .= "" . _("Unit Name") . ": "; - $sToRender .= "\n"; - $sToRender .= $oUnit->getName(); - $sToRender .= "
\n"; - $sToRender .= "" . _("Organisations") . ": "; - $sToRender .= "\n"; - $sToRender .= getOrgDropdown(); - $sToRender .= "\n"; - $sToRender .= "  "; - $sToRender .= "rootUrl/control.php?action=editUnitOrg&fUnitID=" . $oUnit->getID() . "\">\n"; - $sToRender .= "
\n"; - - - return $sToRender; - -} - -function getOrgDropdown(){ - global $default; - - $oPatternListBox = & new PatternListBox($default->organisations_table, "name", "id", "fOrgID"); - $sToRender .= $oPatternListBox->render(); - - return $sToRender; -} - - -// get add pages -function getAddPage($unitID) { - global $default; - - if (isset($iOrgID)) { - $oOrg = Organisation::get($iOrgID); - } - - $sToRender .= renderHeading(_("Add Unit")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Unit Name") . ":
" . _("Select an Organisation") . ": " . getOrgDisplay($oOrg) ; - $sToRender .= "
\n"; - - return $sToRender; -} - -// if edition is successful print out success page -function getAddPageSuccess() { - global $default; - - $sToRender .= renderHeading(_("Add Unit")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Addition Successful!") . "
" . _("New Unit was successfully added") . "
rootUrl/control.php?action=addUnit\">
\n"; - - return $sToRender; -} - -// if edition is successful print out failure page -function getAddPageFail() { - global $default; - - $sToRender .= renderHeading(_("Add Unit")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Addition Unsuccessful") . "
" . _("The Unit was not added. Unit Name Already exists!") . "
rootUrl/control.php?action=addUnit\">
\n"; - - - return $sToRender; -} - - -// if edition is successful print otu success page -function getPageFail() { - global $default; - - $sToRender .= renderHeading(_("Add Unit")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Please enter a name AND Select the Organisation") . "
rootUrl/control.php?action=addUnit\">
\n"; - - - return $sToRender; -} -// if edition is successful print otu success page -function getAddPageToOrgFail() { - global $default; - - $sToRender .= renderHeading(_("Add Unit")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Addition to Organisation Unsuccessful") . "
" . _("The Unit was not added to the Organisation.") . "
rootUrl/control.php?action=addUnit\">
\n"; - - - return $sToRender; -} - - -// show the list box when no unit selected -// then shows a text box with the unit's name -function getOrgDisplay($oOrg) { - global $default; - if (!isset($oOrg)) { - $oPatternListBox = & new PatternListBox($default->organisations_table, "name", "id", "fOrgID"); - return $oPatternListBox->render(); - } else { - return "iId . "\">\n" . - "" . $oOrg->getName() . "\">"; - } - -} - -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc deleted file mode 100644 index 7890af7..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc +++ /dev/null @@ -1,166 +0,0 @@ -\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "" . _("Unit Name") . ": \n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "" . _("Organisation") . ": " . getOrgDisplay() ; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= ""; - $sToRender .= getCancelButton("listUnits") . "\n"; - $sToRender .= "\n"; - - // javascript validation - $sToRender .= "\n\n\n\n"; - - return $sToRender; -} - -// if edition is successful print out success page -function getAddPageSuccess() { - global $default; - - $sToRender .= renderHeading(_("Add Unit")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Addition Successful!") . "
" . _("New Unit was successfully added") . "
" . generateControllerLink("listUnits", "", "") . "
\n"; - - return $sToRender; -} - -// if edition is successful print out failure page -function getAddPageFail($sMessage) { - global $default; - - $sToRender .= renderHeading(_("Add Unit")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Addition Unsuccessful") . "
$sMessage
rootUrl/control.php?action=addUnit&fFolderID=1\">
\n"; - - - return $sToRender; -} - -function getPageFail() { - global $default; - - $sToRender .= renderHeading(_("Add Unit")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Please enter a name AND Select the Organisation") . "
rootUrl/control.php?action=addUnit\">
\n"; - - return $sToRender; -} - -function getAddPageToOrgFail() { - global $default; - - $sToRender .= renderHeading(_("Add Unit")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Addition to Organisation Unsuccessful") . "
" . _("The Unit was not added to the Organisation.") . "
rootUrl/control.php?action=addUnit\">
\n"; - - return $sToRender; -} - -/** - * Displays a drop down list of organisations - */ -function getOrgDisplay() { - global $default; - $aOrganisations = Organisation::getList();/*ok*/ - if ($aOrganisations && (count($aOrganisations) > 0)) { - $oOrganisation = $aOrganisations[0]; - return $oOrganisation->getName() . "getID() . "\"";; - } else { - return _("No organisations") . ""; - } -// $oPatternListBox = & new PatternListBox($default->organisations_table, "name", "id", "fOrgID"); -// return $oPatternListBox->render(); -} - - -function renderBrowsePage($fFolderID) { - global $default; - $sToRender = "\n"; - $sToRender .= "\n"; - $sToRender .= "\t\n"; - $sToRender .= "\n"; - $sToRender .= "
" . renderFolderPath($fFolderID, generateControllerUrl("addUnit", "", false)) . "
\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\t\n"; - $sToRender .= "
" . renderFolderList($fFolderID, generateControllerUrl("addUnit", "", false)) . "\n"; - - $sToRender .= "

\n"; - - return $sToRender; -} - -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitBL.php deleted file mode 100644 index 79f5ae4..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitBL.php +++ /dev/null @@ -1,76 +0,0 @@ -fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc"); - require_once("editUnitUI.inc"); - require_once("$default->fileSystemRoot/lib/security/Permission.inc"); - require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc"); - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); - require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); - require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); - require_once("$default->fileSystemRoot/presentation/Html.inc"); - - - $oPatternCustom = & new PatternCustom(); - - // if a new unit has been added - // coming from manual edit page - if (isset($fForStore)) { - - $oUnit = Unit::get($fUnitID); - - $oUnit->setName($fUnitName); - - if ($fUnitName== "") { - $oPatternCustom->setHtml(getEditPageFail()); - }elseif ($oUnit->update()) { - // if successfull print out success message - $oPatternCustom->setHtml(getEditPageSuccess()); - } else { - // if fail print out fail message - $oPatternCustom->setHtml(getEditPageFail()); - } - } else if (isset($fUnitID)) { - // post back on Unit select from manual edit page - $oPatternCustom->setHtml(getEditPage($fUnitID)); - $main->setFormAction($_SERVER["PHP_SELF"] . "?fForStore=1&fUnitID=$fUnitID"); - } else { - // if nothing happens...just reload edit page - $oPatternCustom->setHtml(getEditPage(null)); - $main->setFormAction($_SERVER["PHP_SELF"]); - } - //render the page - $main->setCentralPayload($oPatternCustom); - $main->render(); -} -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitOrgBL.php deleted file mode 100644 index dd26692..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitOrgBL.php +++ /dev/null @@ -1,66 +0,0 @@ -fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc"); - require_once("editUnitOrgUI.inc"); - require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc"); - require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.inc"); - require_once("$default->fileSystemRoot/lib/security/Permission.inc"); - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); - require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); - require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); - require_once("$default->fileSystemRoot/presentation/Html.inc"); - - $oPatternCustom = & new PatternCustom(); - - if(isset($fUnitID)) { //isset($fUserSet)) { - // do a check to see both drop downs selected - if($fUnitID == -1) { - $oPatternCustom->setHtml(getPageNotSelected()); - } else { - $oPatternCustom->setHtml(renderHeading(_("Edit Unit Organisation"))); - - $oPatternCustom->addHtml(getOrgPage($fUnitID)); - } - } else { - // build first page - $oPatternCustom->setHtml(getPage(null,null)); - $main->setFormAction($_SERVER["PHP_SELF"] . "?fUserSet=1"); - } - - // render page - $main->setCentralPayload($oPatternCustom); - $main->render(); -} -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitOrgUI.inc deleted file mode 100644 index ca9c487..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitOrgUI.inc +++ /dev/null @@ -1,224 +0,0 @@ - 0 ){ - $oLink = $aUnitOrgLink[0]; - } - - $sBgColor = "#F5F6EE"; - - $sToRender .= ""; - $sToRender .= "\n"; - $sToRender .= "
"; - $sToRender .= "rootUrl/control.php?action=listUnits\">"; - $sToRender .= "
"; - - - if ($oLink) { - $oOrg = Organisation::get($oLink->getOrgID()); - $sOrgName = $oOrg->getName(); - $bNoOrg = false; - } else { - $sOrgName = "* " . _("No assigned Organisation"); - $bNoOrg = true; - } - - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
\n"; - - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
\n"; - $sToRender .= _("Current Organisation") . "\n"; - $sToRender .= "
\n"; - - $sToRender .= $sOrgName; - - $sToRender .= "
\n"; - - $sToRender .= "		\n"; - $sToRender .= getUnitOrgEdit($bNoOrg, $iUnitID); - $sToRender .= "
\n"; - - - return $sToRender; - -} - -function getUnitOrgEdit($bNoOrg, $iUnitID = null){ - global $default; - - $sBgColor = "#F5F6EE"; - - $sToRender .= "\n"; - $sToRender .= " "; - if ($bNoOrg) { - $sToRender .= " "; - } else { - $sToRender .= " "; - } - $sToRender .= "
" . _("Options") . "
"; - $sToRender .= "
  rootUrl/control.php?action=addUnitToOrg&fUnitID=" . $iUnitID . "\">" . _("Add Unit to an Organisation") . "

"; - $sToRender .= " 		"; - $sToRender .= "
"; - $sToRender .= "
  rootUrl/control.php?action=removeUnitFromOrg&fUnitID=" . $iUnitID . "\">" . _("Remove Unit from an Organisation") . "

"; - $sToRender .= " 		"; - $sToRender .= "
\n"; - - return $sToRender; - -} - -// get page for removal -function getPage($iUserID) { - global $default; - $oUser = null; - $oGroup = null; - - // change headings if User selected - if (isset($iUserID)) { - $oUser = User::get($iUserID); - } else { - $heading = "" . _("Please select a User") . ":\n"; - } - - $sToRender .= renderHeading(_("Edit User Groups")); - $sToRender .= "\n"; - $sToRender .= $heading; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("User Name") . ": " . getUserDisplay($oUser) . "
\n"; - - return $sToRender; -} - -// show paig if deletion fails -function getPageFail() { - global $default; - - $sToRender .= "" . renderHeading(_("Edit User Groups")) . "
"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Sorry, Removal Failed") . "
rootUrl/control.php?action=removeUserFromGroup\">
\n"; - - return $sToRender; -} - -// show success page if removed from Group successfully -function getPageSuccess() { - global $default; - - $sToRender .= "" . renderHeading(_("Edit User Groups")) . "
"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Success") . "!
" . _("The User was successfully removed from the Group") . "
rootUrl/control.php?action=listUsers\">
\n"; - - return $sToRender; -} - -// show Group details on confirm deletion page -function getGroupDisplay($aGroup) { - global $default; - - $sBgColor = "#F5F6EE"; - $oGroup= null; - $sGroup = ""; - for ($i=0;$i < count($aGroup);$i++) { - $oGroup= Group::get($aGroup[$i]); - $Options .= "\n"; - } - $sGroup .= $Options . "
" . ($i+1) . "". $oGroup->getName() ."
"; - return $sGroup; -} - -// show delete button or select button -function getDeleteButton($oUser) { - global $default; - if (!isset($oUser)) { - return "\n"; - } else { - return "\n"; - } -} - - -// show delete button or select button -function getSelectButton($oUser) { - global $default; - if (!isset($oUser)) { - return "\n"; - } else { - return "\n"; - } -} -// show cancel button -function getCancelButton($oUser) { - global $default; - if (!isset($oUser)) { - //return "rootUrl/control.php?action=UserManagement\">\n"; - } - else { - return "rootUrl/control.php?action=listUsers\">\n"; - } -} - - -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitUI.inc deleted file mode 100644 index ad397ea..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitUI.inc +++ /dev/null @@ -1,123 +0,0 @@ -\n"; - $sToRender .= "" . _("Please edit the Unit name") . "\n"; - $sToRender .= "\n"; - $sToRender .= "" . _("Unit Name") . ": " . getUnitDisplay($oUnit) . "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "" . getUpdateButton($oUnit) . getCancelButton($oUnit) . ""; - $sToRender .= "\n"; - - return $sToRender; -} - -// if edition is successful print otu success page -function getEditPageSuccess() { - global $default; - - $sToRender .= renderHeading(_("Edit Unit")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Success") . "!
" . _("The Unit was successfully modified") . "
rootUrl/control.php?action=listUnits\">
\n"; - - - return $sToRender; -} - - -// gets the page if edition fails -function getEditPageFail() { - global $default; - - $sToRender .= renderHeading(_("Edit Unit")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . strtoupper(_("Failure")) . "!
" . _("Unit modification Failed!") . "
rootUrl/control.php?action=listUnits\">
\n"; - return $sToRender; -} - -// show the list box when no unit selected -// then shows a text box with the unit's name -function getUnitDisplay($oUnit) { - global $default; - if (!isset($oUnit)) { - $oPatternListBox = & new PatternListBox($default->units_table, "name", "id", "fUnitID"); - $oPatternListBox->setPostBackOnChange(true); - return $oPatternListBox->render(); - } else { - return "iId . "\">\n" . - "getName() . "\">"; - } -} - - -// gets the updatebutton when a unit is selected -function getUpdateButton($oUnit) { - global $default; - if (isset($oUnit)) { - return "\n"; - } -} - -// gets the cancel button when a unit is selected -function getCancelButton($oUnit) { - global $default; - if (!isset($oUnit)) { - return "rootUrl/control.php?action=unitManagement\">\n"; - } else { - return "rootUrl/control.php?action=listUnits\">\n"; - } -} -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsBL.php deleted file mode 100644 index efe827d..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsBL.php +++ /dev/null @@ -1,48 +0,0 @@ -fileSystemRoot/lib/users/User.inc"); -require_once("$default->fileSystemRoot/lib/security/Permission.inc"); -require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); -require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc"); -require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); -require_once("$default->fileSystemRoot/presentation/Html.inc"); -require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc"); -require_once("listUnitsUI.inc"); - -if (checkSession()) { - $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getPage($fOrganisationID)); - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - $main->setCentralPayload($oPatternCustom); - $main->setFormAction($_SERVER['PHP_SELF']); - $main->render(); -} -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsUI.inc deleted file mode 100644 index 5c36097..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsUI.inc +++ /dev/null @@ -1,78 +0,0 @@ -organisations_table, "name", "id", "iOrganisationID"); - $oPatternListBox->setPostBackOnChange(true); - if ($iOrganisationID != 0) { - $oPatternListBox->setSelectedValue($iOrganisationID); - } - return "
" . _("Filter By Organisation") . " " . $oPatternListBox->render() . "
"; -} - -function getUnits($iOrganisationID) { - global $default; - - $aParams = array(); - /*ok*/ $sQuery = "SELECT units_lookup.id as unitID, units_lookup.name as name, " . - "'Edit', 'Delete', 'Edit Organisations', " . - "CASE WHEN organisations_lookup.name Is Null THEN '* No Organisation' ELSE organisations_lookup.name END AS OrgName " . - "FROM (units_lookup " . - "LEFT JOIN units_organisations_link ON units_lookup.id = units_organisations_link.unit_id) " . - "LEFT JOIN organisations_lookup ON units_organisations_link.organisation_id = organisations_lookup.id "; - if ($iOrganisationID) { - $sQuery .= "WHERE units_organisations_link.organisation_id = ? "; - $aParams[] = $iOrganisationID; - } - $sQuery .= "ORDER BY units_lookup.name"; - - $aColumns = array("name", "OrgName", "Edit", "Delete");//, "Edit Organisations"); - $aColumnNames = array(_("Unit Name"), _("Organisation"), _("Edit"), _("Delete"));//, "Edit Organisations"); - $aColumnTypes = array(1,1,3,3);//,3); - $aDBColumnArray = array("unitID"); - $aQueryStringVariableNames = array("fUnitID"); - - $aHyperLinkURL = array( 2=> "$default->rootUrl/control.php?action=editUnit", - 3=> "$default->rootUrl/control.php?action=removeUnit"); - //4=> "$default->rootUrl/control.php?action=editUnitOrg"); - - $oSearchResults = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnNames, "100%", $aHyperLinkURL,$aDBColumnArray,$aQueryStringVariableNames); - $oSearchResults->setDisplayColumnHeadings(true); - return $oSearchResults->render() ; -} - -function getPage($iOrganisationID) { - global $default; - $sToRender .= renderHeading(_("Unit Management")); - - $sToRender .= getAddLink("addUnit&fFolderID=1", _("Add A Unit")); - - //$sToRender .= getOrganisationDisplay($iOrganisationID); - $sToRender .= getUnits($iOrganisationID); - return $sToRender; -} -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php deleted file mode 100644 index 8ad0ea0..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php +++ /dev/null @@ -1,102 +0,0 @@ -fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc"); - require_once("removeUnitUI.inc"); - require_once("$default->fileSystemRoot/lib/security/Permission.inc"); - require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc"); - require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.inc"); - require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc"); - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); - require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); - require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); - require_once("$default->fileSystemRoot/presentation/Html.inc"); - - $oPatternCustom = & new PatternCustom(); - - if ($fUnitID) { - // retrieve unit object - $oUnit = Unit::get($fUnitID); - if ($oUnit) { - - // if the unit has groups linked to it, then it can't be deleted - if ($oUnit->hasGroups()) { - // display error message - $oPatternCustom->setHtml(getStatusPage( - sprintf(_("Can't delete Unit '%s'"), $oUnit->getName()), _("Please remove all groups belonging to this Unit before attempting to delete it"))); - } else { - // retrieve organisation link (for later deletion or to get the organisation id) - $oUnitOrg = UnitOrganisationLink::getByUnitID($fUnitID); - if ($oUnitOrg) { - $oOrganisation = Organisation::get($oUnitOrg->getOrgID()); - } - - // we've received confirmation, so delete - if (isset($fForDeleteConfirmed)) { - //delete unit object - if ($oUnit->delete()) { - // delete the link between this unit and its organisation if there is one - if ($oUnitOrg) { - if ($oUnitOrg->delete()) { - $oPatternCustom->setHtml(getStatusPage(_("Unit SuccessFully Removed!"))); - } else { - // couldn't delete the link to the organisation - $oPatternCustom->setHtml(getStatusPage(_("Deletion of Unit Organisation Link Failed!"), _("The Unit was deleted, but the link to the Organisation could not be deleted"))); - } - } else { - // no organisation mapped - $oPatternCustom->setHtml(getStatusPage(_("Unit SuccessFully Removed!"))); - } - } else { - $oPatternCustom->setHtml(getStatusPage(sprintpf(_("Deletion of Unit '%s' failed!"), $oUnit->getName()))); - } - // ask for confirmation before deleting - } else { - $oPatternCustom->setHtml(getConfirmDeletePage($oUnit, $oOrganisation)); - $main->setFormAction($_SERVER["PHP_SELF"] . "?fForDeleteConfirmed=1"); - } - } - } else { - // couldn't retrieve unit from db - $oPatternCustom->setHtml(getStatusPage(_("No Unit selected for deletion."))); - } - } else { - // no params received, error - $oPatternCustom->setHtml(getStatusPage(_("No Unit selected for deletion."))); - } - - $main->setCentralPayload($oPatternCustom); - $main->render(); -} -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitFromOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitFromOrgBL.php deleted file mode 100644 index 484de53..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitFromOrgBL.php +++ /dev/null @@ -1,121 +0,0 @@ -fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc"); - require_once("removeUnitFromOrgUI.inc"); - require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc"); - require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc"); - require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.inc"); - require_once("$default->fileSystemRoot/lib/security/Permission.inc"); - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); - require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); - require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); - require_once("$default->fileSystemRoot/presentation/Html.inc"); - - $oPatternCustom = & new PatternCustom(); - - $oPatternCustom->addHtml(renderHeading(_("Remove Unit from an Organisation"))); - - if (isset($fUnitID)) { - if ($fOrgID == "" && $fRemove == 1){ - $main->setErrorMessage(_("An error occured.")); - $main->setFormAction($_SERVER["PHP_SELF"] . "?fUnitID=$fUnitID&fAdd=1" ); - } - if ($fOrgID > 0) { - //$oUnitOrgLink = & new UnitOrganisationLink($fUnitID,$fOrgID); - $aWhereClase = array("WHERE unit_id = ? AND organisation_id = ?", array($fUnitID, $fOrgID)); - $aUnitOrgLink = UnitOrganisationLink::getList($aWhereClase);/*ok*/ - if (count($aUnitOrgLink) > 1) { - $oPatternCustom->addHtml(_("Error") . ":" . _("Multiple links exist even though a Unit can only belong to one Organisation.")); - }else { - $oLinkObject = $aUnitOrgLink[0]; - if ($oLinkObject->delete()) { - $oPatternCustom->addHtml(getRemoveSuccessPage()); - } else { - $oPatternCustom->addHtml(getRemoveFailPage()); - } - } - - } else{ - $oLink = UnitOrganisationLink::getByUnitID($fUnitID); - - if($oLink){ - $oPatternCustom->addHtml(getRemoveUnitsPage($oLink)); - $main->setFormAction($_SERVER["PHP_SELF"] . "?fUnitID=$fUnitID&fRemove=1&fOrgID=" . $oLink->getOrgID() ); - } - } - } - else { - - if (isset($fForStore)) { - if($fUnitName != "" and $fOrgID != "") { - $oUnit = new Unit($fUnitName); - - // if creation is successfull..get the unit id - if ($oUnit->create()) { - $unitID = $oUnit->getID(); - $oUnitOrg = new UnitOrganisationLink($unitID,$fOrgID); - - if($oUnitOrg->create()) { - // if successfull print out success message - $oPatternCustom->setHtml(getAddPageSuccess()); - } else { - // if fail print out fail message - $oPatternCustom->setHtml(getAddToOrgFail()); - } - } else { - // if fail print out fail message - $oPatternCustom->setHtml(getAddPageFail()); - } - } else { - $oPatternCustom->setHtml(getPageFail()); - } - - } else if (isset($fUnitID)) { - // post back on Unit select from manual edit page - $oPatternCustom->setHtml(getAddPage($fUnitID)); - $main->setFormAction($_SERVER["PHP_SELF"] . "?fForStore=1"); - } else { - // if nothing happens...just reload edit page - $oPatternCustom->setHtml(getAddPage(null)); - $main->setFormAction($_SERVER["PHP_SELF"]. "?fForStore=1"); - - } - - } - - $main->setCentralPayload($oPatternCustom); - $main->render(); -} -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitFromOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitFromOrgUI.inc deleted file mode 100644 index 85f1ddb..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitFromOrgUI.inc +++ /dev/null @@ -1,231 +0,0 @@ -\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - - $sToRender .= _("Failure while trying to remove Unit from the Organisation.") . "\n"; - $sToRender .= "rootUrl/control.php?action=listUnits\">\n"; - - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - return $sToRender; - -} -function getRemoveSuccessPage(){ - global $default; - - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
\n"; - - $sToRender .= _("Unit has been successfully removed from the Organisation.") . "\n"; - $sToRender .= "rootUrl/control.php?action=listUnits\">\n"; - - $sToRender .= "
\n"; - - return $sToRender; -} - - -function getRemoveUnitsPage($oLink) { - global $default; - - if($oLink){ - $oOrg = Organisation::get($oLink->getOrgID()); - $oUnit = Unit::get($oLink->getUnitID()); - - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "  \n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Do you wish to remove the Unit from the Organisation?") . "
\n"; - $sToRender .= "" . _("Unit Name") . ": "; - $sToRender .= "\n"; - $sToRender .= $oUnit->getName(); - $sToRender .= "
\n"; - $sToRender .= "" . _("Organisation") . ": "; - $sToRender .= "\n"; - $sToRender .= $oOrg->getName(); - $sToRender .= "\n"; - $sToRender .= "  "; - $sToRender .= "rootUrl/control.php?action=editUnitOrg&fUnitID=" . $oUnit->getID() . "\">\n"; - $sToRender .= "
\n"; - } else { - $sToRender .= _("Link object is empty.") . "\n"; - } - - return $sToRender; - -} - -function getOrgDropdown(){ - global $default; - - $oPatternListBox = & new PatternListBox($default->organisations_table, "name", "id", "fOrgID"); - $sToRender .= $oPatternListBox->render(); - - return $sToRender; -} - - -// get add pages -function getAddPage($unitID) { - global $default; - - if (isset($iOrgID)) { - $oOrg = Organisation::get($iOrgID); - } - - $sToRender .= renderHeading(_("Add Unit")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Unit Name") . ":
" . _("Select an Organisation") . ": " . getOrgDisplay($oOrg) ; - $sToRender .= "
\n"; - - return $sToRender; -} - -// if edition is successful print out success page -function getAddPageSuccess() { - global $default; - - $sToRender .= renderHeading(_("Add Unit")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Addition Successful!") . "
" . _("New Unit was successfully added") . "
rootUrl/control.php?action=addUnit\">
\n"; - - return $sToRender; -} - -// if edition is successful print out failure page -function getAddPageFail() { - global $default; - - $sToRender .= renderHeading(_("Add Unit")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Addition Unsuccessful") . "
" . _("The Unit was not added. Unit Name Already exists!") . "
rootUrl/control.php?action=addUnit\">
\n"; - - - return $sToRender; -} - - -// if edition is successful print otu success page -function getPageFail() { - global $default; - - $sToRender .= renderHeading(_("Add Unit")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Please enter a name AND Select the Organisation") . "
rootUrl/control.php?action=addUnit\">
\n"; - - - return $sToRender; -} -// if edition is successful print otu success page -function getAddPageToOrgFail() { - global $default; - - $sToRender .= renderHeading(_("Add Unit")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
" . _("Addition to Organisation Unsuccessful") . "
" . _("The Unit was not added to the Organisation.") . "
rootUrl/control.php?action=addUnit\">
\n"; - - - return $sToRender; -} - - -// show the list box when no unit selected -// then shows a text box with the unit's name -function getOrgDisplay($oOrg) { - global $default; - if (!isset($oOrg)) { - $oPatternListBox = & new PatternListBox($default->organisations_table, "name", "id", "fOrgID"); - return $oPatternListBox->render(); - } else { - return "iId . "\">\n" . - "" . $oOrg->getName() . "\">"; - } - -} - -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitUI.inc deleted file mode 100644 index ab410ad..0000000 --- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitUI.inc +++ /dev/null @@ -1,115 +0,0 @@ -\n"; - $sToRender .= "" . _("Are you sure you wish to Remove this Unit:") . "\n"; - $sToRender .= "\n"; - $sToRender .= "" . _("Unit Name") . ": " . getUnitDisplay($oUnit) . "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "" . _("Organisation Name") . ": " . getOrgDisplay($oOrg) . "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= getDeleteButton($oUnit); - $sToRender .= "\n"; - $sToRender .= "\n"; - - return $sToRender; -} - -function getStatusPage($sHeading, $sText = "") { - - global $default; - - $sToRender .= renderHeading(_("Remove Unit")); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
$sHeading
$sText
rootUrl/control.php?action=listUnits\">
\n"; - - return $sToRender; -} - -// show listbox...or the text name -function getUnitDisplay($oUnit) { - global $default; - if (!isset($oUnit)) { - $oPatternListBox = & new PatternListBox($default->units_table, "name", "id", "fUnitID"); - $oPatternListBox->setIncludeDefaultValue(true); - $oPatternListBox->setPostBackOnChange(true); - return $oPatternListBox->render(); - } else { - return "iId . "\">\n" . - "" . $oUnit->getName() . ""; - } - -} - -// show listbox...or the text name -function getOrgDisplay($oOrg) { - global $default; - if (isset($oOrg)) { - return "iId . "\">\n" . - "" . $oOrg->getName() . ""; - } else { - return "* " . _("Not Assigned to an Organisation") . ""; - } -} - - -// show delete button -function getDeleteButton($oUnit) { - global $default; - if (isset($oUnit)) { - return "\n". - "rootUrl/control.php?action=listUnits\">\n"; - } -} - - -// show cancel button -function getCancelButton($oUnit) { - global $default; - if (!isset($oUnit)) { - return "rootUrl/control.php?action=unitManagement\">\n"; - } else { - return "rootUrl/control.php?action=listUnits\">\n"; - } -} - -?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/unitManagement.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/unitManagement.php new file mode 100644 index 0000000..85dd2be --- /dev/null +++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/unitManagement.php @@ -0,0 +1,84 @@ + 'administration', 'name' => 'Administration'), + ); + + function do_main() { + $this->aBreadcrumbs[] = array('action' => 'unitManagement', 'name' => 'Unit Management'); + $this->oPage->setBreadcrumbDetails('select a unit'); + $this->oPage->setTitle("Unit Management"); + + $unit_id= KTUtil::arrayGet($_REQUEST, 'unit_id', null); + if ($unit_id === null) { $for_edit = false; } + else { $for_edit = true; } + + + $add_fields = array(); + $add_fields[] = new KTStringWidget('Unit Name','The unit\'s visible name. e.g. Tech Support', 'name', null, $this->oPage, true); + + $unit_list =& Unit::getList(); + + $edit_fields = array(); + $edit_unit = null; + if ($for_edit === true) { + $oUnit = Unit::get($unit_id); + $edit_fields[] = new KTStringWidget('Unit Name','The unit\'s visible name. e.g. Tech Support', 'name', $oUnit->getName(), $this->oPage, true); + } + + $oTemplating = new KTTemplating; + $oTemplate = $oTemplating->loadTemplate("ktcore/principals/unitadmin"); + $aTemplateData = array( + "context" => $this, + "add_fields" => $add_fields, + "for_edit" => $for_edit, + "edit_fields" => $edit_fields, + "edit_unit" => $oUnit, + "unit_list" => $unit_list, + ); + return $oTemplate->render($aTemplateData); + } + + function do_updateUnit() { + $unit_id = KTUtil::arrayGet($_REQUEST, 'unit_id'); + $oUnit = Unit::get($unit_id); + if (PEAR::isError($oUnit) || ($oUnit == false)) { + $this->errorRedirectToMain('Please specify a unit.'); + exit(0); + } + + $unit_name = KTUtil::arrayGet($_REQUEST, 'name', null); + if (empty($unit_name)) { + $this->errorRedirectToMain('Please specify a unit name.'); + exit(0); + } + + $this->startTransaction(); + $oUnit->setName($unit_name); + $res = $oUnit->update(); + if (PEAR::isError($res)) { + $this->errorRedirectToMain('Failed to update unit name.'); + exit(0); + } + + $this->commitTransaction(); + $this->successRedirectToMain('Unit name changed to "' . $unit_name . '"'); + } + +} + + +?> \ No newline at end of file diff --git a/templates/kt3/fields/lookup.smarty b/templates/kt3/fields/lookup.smarty index b76adfb..984060c 100644 --- a/templates/kt3/fields/lookup.smarty +++ b/templates/kt3/fields/lookup.smarty @@ -13,7 +13,7 @@ diff --git a/templates/ktcore/principals/groupadmin.smarty b/templates/ktcore/principals/groupadmin.smarty index dfae42b..6fcd468 100644 --- a/templates/ktcore/principals/groupadmin.smarty +++ b/templates/ktcore/principals/groupadmin.smarty @@ -30,7 +30,6 @@ very slow if you have many groups.

Group Name Unit Name Edit - Change Unit Manage Users Manage sub-groups Delete @@ -43,10 +42,10 @@ very slow if you have many groups.

{$oGroup->getName()} {if (!$oGroup->hasUnit())}not part of a unit{else} - fixme unit. + {$context->_getUnitName($oGroup)} + {/if} Edit - Change Unit Manage Users Manage sub-groups Delete diff --git a/templates/ktcore/principals/orgadmin.smarty b/templates/ktcore/principals/orgadmin.smarty new file mode 100644 index 0000000..66a8319 --- /dev/null +++ b/templates/ktcore/principals/orgadmin.smarty @@ -0,0 +1,44 @@ +

Orgnisation Administration

+ +

FIXME Overview of Organisations.

+ +{if ($for_edit === true)} + +
+
+Change organisation details + +asd + + + + +{foreach item=oWidget from=$edit_fields} + {$oWidget->render()} +{/foreach} + +
+ +
+
+
+ +{/if} + + + + + + + + + + {foreach item=oOrg from=$org_list} + + + + + + {/foreach} + +
Organisation NameEdit
{$oOrg->getName()}Edit
\ No newline at end of file diff --git a/templates/ktcore/principals/unitadmin.smarty b/templates/ktcore/principals/unitadmin.smarty new file mode 100644 index 0000000..8c687a9 --- /dev/null +++ b/templates/ktcore/principals/unitadmin.smarty @@ -0,0 +1,62 @@ +

Unit Administration

+ +

FIXME Overview of units.

+ +{if ($for_edit === false)} + +
+
+Add a unit + + + +{foreach item=oWidget from=$add_fields} + {$oWidget->render()} +{/foreach} + +
+ +
+
+
+ +{else} + +
+
+Change a unit's details + + + + +{foreach item=oWidget from=$edit_fields} + {$oWidget->render()} +{/foreach} + +
+ +
+
+
+ + +{/if} + + + + + + + + + + + {foreach item=oUnit from=$unit_list} + + + + + + {/foreach} + +
Unit NameEditManage Members
{$oUnit->getName()}Edit
\ No newline at end of file -- libgit2 0.21.4