diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsBL.php
index 529a686..5ccce71 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsBL.php
@@ -27,22 +27,13 @@
require_once("../../../../../config/dmsDefaults.php");
-KTUtil::extractGPC('fDeleteConfirmed', 'fDocFieldID', 'fGroupID', 'fGroupSet', 'fOtherGroupID', 'fUserID', 'faGroupID');
+KTUtil::extractGPC('fDocFieldID');
if (checkSession()) {
- require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
- require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
require_once("editDocFieldLookupsUI.inc");
require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentField.inc");
- require_once("$default->fileSystemRoot/lib/documentmanagement/MetaData.inc");
- require_once("$default->fileSystemRoot/lib/users/User.inc");
- require_once("$default->fileSystemRoot/lib/groups/GroupUserLink.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");
+ require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
$oPatternCustom = & new PatternCustom();
@@ -50,41 +41,14 @@ if (checkSession()) {
$oDocField = DocumentField::get($fDocFieldID);
if ($oDocField->getHasLookup()){
// do a check to see both drop downs selected
- if($fDocFieldID == -1) {
- $oPatternCustom->setHtml(getPageNotSelected());
- } else {
- //$oMetaData = new MetaData();
- //$faGroupID = GroupUserLink::getGroups($fUserID);
- $oPatternCustom->setHtml(getGroupPage($fDocFieldID));
- $main->setFormAction($_SERVER["PHP_SELF"] . "?fUserSet=1&fGroupSet=1");
- }
+ $oPatternCustom->setHtml(getPage($oDocField));
} else {
- $oPatternCustom->setHtml(getLookupNotSet());
+ $_SESSION["KTErrorMessage"][] = _("Document Field is not Lookup enabled.");
+ exit(controllerRedirect("listDocFields"));
}
} else {
- // build first page
- $oPatternCustom->setHtml(getPage(null,null));
- $main->setFormAction($_SERVER["PHP_SELF"] . "?fUserSet=1");
- }
-
- if(isset($fGroupSet)) {
- if($fOtherGroupID) {
- $oPatternCustom->setHtml("Add");
- } else {
- $oPatternCustom->setHtml("Delete");
- $main->setFormAction($_SERVER["PHP_SELF"] . "?fDeleteConfirmed=1&fGroupID=$fGroupID");
- }
- }
-
- if (isset($fDeleteConfirmed)) {
- // else add to db and then goto page succes
- $oUserGroup = new GroupUserLink($fGroupID, $fUserID);
- $oUserGroup->setUserGroupID($fGroupID,$fUserID);
- if($oUserGroup->delete()) {
- $oPatternCustom->setHtml(getPageSuccess());
- } else {
- $oPatternCustom->setHtml(getPageFail());
- }
+ $_SESSION["KTErrorMessage"][] = _("No document field lookup selected");
+ exit(controllerRedirect("listDocFields"));
}
// render page
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsUI.inc
index 1e0e639..6df781f 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldLookupsUI.inc
@@ -4,7 +4,7 @@
*
* Edit document field lookups UI functions
*
- * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ * Copyright (c) 2003, 2005 Jam Warehouse http://www.jamwarehouse.com
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -24,68 +24,18 @@
* @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
* @package administration.docfieldmanagement
*/
-
-function getLookupNotSet() {
- global $default;
-
- $sToRender .= renderHeading(_("Edit User Groups"));
- $sToRender .= "
\n";
- $sToRender .= "\n";
- $sToRender .= "\n";
- $sToRender .= _("Document Field is not Lookup enabled.");
- $sToRender .= " \n";
- $sToRender .= " \n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= "rootUrl/control.php?action=listDocFields\"> ";
- $sToRender .= " \n";
- $sToRender .= "
\n";
-
- return $sToRender ;
-}
-// get page for removal
-function getPage($iUserID) {
+require_once("$default->fileSystemRoot/presentation/Html.inc");
+
+function getPage($oDocField) {
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 .= "" . _("User Name") . ": " . getUserDisplay($oUser) . " \n";
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= "
\n";
-
- return $sToRender;
-}
-
-
-
-// get page for removal
-function getGroupPage($iDocFieldID) {
- global $default;
+ $iDocFieldID = $oDocField->getID();
- $oDocField = DocumentField::get($iDocFieldID);
-
$LookupDisplay .= "" . _("Current Lookups") . " \n";
- $sQuery = " Select * " .
- " From " . $default->metadata_table .
- " WHERE document_field_id=" . $iDocFieldID;
+ $sQuery = array("SELECT * FROM " . $default->metadata_table .
+ " WHERE document_field_id = ?",
+ array($iDocFieldID));
$aColumns = array("name");
$aColumnNames = array(_("Lookup name"));
@@ -147,174 +97,4 @@ function getGroupPage($iDocFieldID) {
return $sToRender;
}
-// get page for removal
-function getDeleteConfirmedPage($iUserID,$iGroupID) {
- global $default;
- $oUser = null;
- $oGroup = null;
-
- // change headings if User selected
- if (isset($iUserID)) {
- $oUser = User::get($iUserID);
- $heading = "" . _("Are you sure you wish to remove this user from the Group?") . " ";
- }
-
- // change headings if User selected
- if (isset($iGroupID)) {
- $oGroup = Group::get($iGroupID);
- $Groupdisplay = "" . _("Group Name") . ": " . $oGroup->getName() . " \n";
- }
-
- $sToRender .= "" . renderHeading(_("Edit User Groups")) . "
";
- $sToRender .= "\n";
- $sToRender .= "\n";
- $sToRender .= $heading;
- $sToRender .= " \n";
- $sToRender .= "". _("User Name") . ": " . getUserDisplay($oUser) . " \n";
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= $Groupdisplay;
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= "" . getDeleteButton($oUser);
- $sToRender .= " " . getCancelButton($oUser);
- $sToRender .= "
\n";
-
-
- return $sToRender;
-}
-
-// show paig if deletion fails
-function getPageFail() {
- global $default;
-
- $sToRender .= "" . renderHeading(_("Edit User Groups")) . "
";
- $sToRender .= "\n";
- $sToRender .= "" . _("Sorry, Removal Failed") . " \n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= "rootUrl/control.php?action=removeUserFromGroup\"> \n";
- $sToRender .= " \n";
-
- $sToRender .= "
\n";
-
-
- return $sToRender;
-}
-
-// show success page if removed from Group successfully
-function getPageSuccess() {
- global $default;
-
- $sToRender .= "" . renderHeading(_("Edit User Groups")) . "
";
- $sToRender .= "\n";
- $sToRender .= "" . _("Success") . "! \n";
- $sToRender .= " \n";
- $sToRender .= "" . _("The User was successfully removed from the Group") . " \n";
- $sToRender .= " \n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= "rootUrl/control.php?action=listUsers\"> \n";
- $sToRender .= " \n";
- $sToRender .= "
\n";
-
-
- return $sToRender;
-}
-// show listbox of Users belonging to Users_Groups_link table
-function getUserDisplay($oUser) {
- global $default;
- if (!isset($oUser)) {
- $oPatternListBox = & new PatternListBox($default->users_table, "username", "id", "fUserID");
- if (Permission::userIsUnitAdministrator()) {
- $oPatternListBox->setFromClause("INNER JOIN $default->users_groups_table UGL on ST.id=UGL.user_id " .
- "INNER JOIN $default->groups_units_table GUL on UGL.group_id=GUL.group_id");
- $oPatternListBox->setWhereClause("GUL.unit_id=" . User::getUnitID($_SESSION["userID"]));
- }
- $oPatternListBox->setPostBackOnChange(true);
- return $oPatternListBox->render();
- } else {
- return " iId . "\">\n" .
- $oUser->getUserName();
- }
-}
-
-// display the listbox initially ..then just display the text
-function getOtherGroupDisplay($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", "fOtherGroupID");
- $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", "fOtherGroupID");
- $oPatternListBox->setFromClause("INNER JOIN $default->groups_units_table GUL on ST.id=GUL.group_id");
- $oPatternListBox->setWhereClause("GUL.unit_id=" . User::getUnitID($_SESSION["userID"]));
- }
- return $oPatternListBox->render();
- } else {
- return " iId . "\">\n" .
- $oGroup->getName();
- }
-}
-// 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 .= "" . ($i+1) . " ". $oGroup->getName() ." \n";
- }
- $sGroup .= $Options . "
";
- 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";
- }
-}
-
-
?>