Brad Shuttleworth 2006-02-15 fix KTS-164

Brad Shuttleworth 2006-02-15 fix for KTS-145. Brad Shuttleworth 2006-02-15 getByDocumentAndField needs to use oField t... Brad Shuttleworth 2006-02-14 make transition screen more helpful. Brad Shuttleworth 2006-02-14 fix for KTS-384 Brad Shuttleworth 2006-02-14 attempt a fix of the folder::copy bug,. Brad Shuttleworth 2006-02-14 make password length admin override a confi... Brad Shuttleworth 2006-02-14 beef up the way that users are fetched... Brad Shuttleworth 2006-02-14 folder delete errors were using "array_join... git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4927 c91229c3-7414-0410-bfa2-8a42b809f60b

Brad Shuttleworth 2006-02-15 fix KTS-164
Brad Shuttleworth 2006-02-15 fix for KTS-145. Brad Shuttleworth 2006-02-15 getByDocumentAndField needs to use oField t... Brad Shuttleworth 2006-02-14 make transition screen more helpful. Brad Shuttleworth 2006-02-14 fix for KTS-384 Brad Shuttleworth 2006-02-14 attempt a fix of the folder::copy bug,. Brad Shuttleworth 2006-02-14 make password length admin override a confi... Brad Shuttleworth 2006-02-14 beef up the way that users are fetched... Brad Shuttleworth 2006-02-14 folder delete errors were using "array_join... git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4927 c91229c3-7414-0410-bfa2-8a42b809f60b
Brad Shuttleworth
1 parent 12f57aa2
Showing 15 changed files with 432 additions and 79 deletions
config/config.ini
config/dmsDefaults.php
lib/documentmanagement/DocumentFieldLink.inc
lib/foldermanagement/folderutil.inc.php
lib/groups/Group.inc
plugins/ktcore/admin/ajaxComplexConditionals.php
plugins/ktcore/admin/manageConditionals.php
plugins/ktcore/admin/userManagement.php
resources/css/kt-framing.css
resources/js/conditional_complex_edit.js
resources/js/conditional_simple_edit.js
templates/ktcore/metadata/conditional/editcomplex.smarty
templates/ktcore/metadata/conditional/editsimple.smarty
templates/ktcore/metadata/conditional/manageConditional.smarty
templates/ktcore/workflow/manageTransitions.smarty
@@ -149,3 +149,7 @@ antiword = antiword
 ; minimum password length on password-setting
 ; could be moved into DB-auth-config
 passwordLength = 6
+
+; apply the minimum password length to admin while creating / editing accounts?
+; default is set to "false" meaning that admins can create users with shorter passwords.
+restrictAdminPasswords = default
@@ -390,6 +390,9 @@ $oKTConfig-&gt;setdefaultns(&quot;tweaks&quot;, &quot;genericMetaDataRequired&quot;, true);
 $oKTConfig->setdefaultns("tweaks", "phpErrorLogFile", false);
 $oKTConfig->setdefaultns("tweaks", "developmentWindowLog", false);
+$oKTConfig->setdefaultns("user_prefs", "passwordLength", 6);
+$oKTConfig->setdefaultns("user_prefs", "restrictAdminPasswords", false);
+
 $oKTConfig->setdefaultns("ui", "ieGIF", true);
 $oKTConfig->setdefaultns("ui", "alwaysShowAll", false);
@@ -163,7 +163,7 @@ class DocumentFieldLink extends KTEntity {
         $iMetadataVersionId = $oDocument->getMetadataVersionId();
         return KTEntityUtil::getByDict('DocumentFieldLink', array(
             'metadata_version_id' => $iMetadataVersionId,
-            'document_field_id' => KTUtil::getId($oDocument),
+            'document_field_id' => KTUtil::getId($oField),
         ));
     }
 }
@@ -223,10 +223,10 @@ class KTFolderUtil {
             $sFD = '';
             $sFF = '';
             if (!empty($aFailedDocuments)) {
-                $sFD = _('Documents: ') . array_join(', ', $aFailedDocuments) . '. ';
+                $sFD = _('Documents: ') . implode(', ', $aFailedDocuments) . '. ';
             }
             if (!empty($aFailedFolders)) {
-                $sFF = _('Folders: ') . array_join(', ', $aFailedFolders) . '.';
+                $sFF = _('Folders: ') . implode(', ', $aFailedFolders) . '.';
             }
             return PEAR::raiseError(_('You do not have permission to delete these items. ') . $sFD . $sFF);
         }
@@ -267,7 +267,7 @@ class KTFolderUtil {
         $oPerm = KTPermission::getByName('ktcore.permissions.read');
         $oBaseFolderPerm = KTPermission::getByName('ktcore.permissions.addFolder');
-        if (!KTPermissionUtil::userHasPermissionOnItem($oUser, $oPerm, $oDestFolder)) {
+        if (!KTPermissionUtil::userHasPermissionOnItem($oUser, $oBaseFolderPerm, $oDestFolder)) {
             return PEAR::raiseError(_('You are not allowed to create folders in the destination.'));
         }
@@ -298,7 +298,7 @@ class KTFolderUtil {
             // child documents
             $aChildDocs = Document::getList(array('folder_id = ?',array($iFolderId)));
             foreach ($aChildDocs as $oDoc) {
-                if (KTPermissionUtil::userHasPermissionOnItem($oUser, $oPerm, $oFolder)) {
+                if (KTPermissionUtil::userHasPermissionOnItem($oUser, $oPerm, $oDoc)) {
                     $aDocuments[] = $oDoc;
                 } else {
                     $aFailedDocuments[] = $oDoc->getName();
@@ -314,10 +314,10 @@ class KTFolderUtil {
             $sFD = '';
             $sFF = '';
             if (!empty($aFailedDocuments)) {
-                $sFD = _('Documents: ') . array_join(', ', $aFailedDocuments) . '. ';
+                $sFD = _('Documents: ') . implode(', ', $aFailedDocuments) . '. ';
             }
             if (!empty($aFailedFolders)) {
-                $sFF = _('Folders: ') . array_join(', ', $aFailedFolders) . '.';
+                $sFF = _('Folders: ') . implode(', ', $aFailedFolders) . '.';
             }
             return PEAR::raiseError(_('You do not have permission to copy these items. ') . $sFD . $sFF);
         }
@@ -325,6 +325,9 @@ class KTFolderUtil {
         // first we walk the tree, creating in the new location as we go.
         // essentially this is an "ok" pass.
+        
+        $oStorage =& KTStorageManagerUtil::getSingleton();        
+        
         $aFolderMap = array();
         $sTable = KTUtil::getTableName('folders');
@@ -339,7 +342,13 @@ class KTFolderUtil {
             return $id;
         }
         $aFolderMap[$oFolder->getId()] = $id;
-        
+        $oNewBaseFolder = Folder::get($id);
+        $res = $oStorage->createFolder($oNewBaseFolder);
+        if (PEAR::isError($res)) {
+            // it doesn't exist, so rollback and raise..
+            DBUtil::rollback();
+            return $res;
+        }
         $aRemainingFolders = Folder::getList(array('parent_id = ?', array($oFolder->getId())), array('ids' => true));
@@ -359,34 +368,30 @@ class KTFolderUtil {
                 return $id;
             }
             $aFolderMap[$iFolderId] = $id;
+            $oNewFolder = Folder::get($id);
+            $res = $oStorage->createFolder($oNewFolder);
+            if (PEAR::isError($res)) {
+                // first delete, then rollback, then fail out.
+                $oStorage->removeFolder($oNewBaseFolder);
+                DBUtil::rollback();
+                return $res;
+            }
             $aCFIds = Folder::getList(array('parent_id = ?', array($iFolderId)), array('ids' => true));
             $aRemainingFolders = array_merge($aRemainingFolders, $aCFIds);
         }
+        
+        
         // now we can go ahead.
         foreach ($aDocuments as $oDocument) {
             $oChildDestinationFolder = Folder::get($aFolderMap[$oDocument->getFolderID()]);
             $res = KTDocumentUtil::copy($oDocument, $oChildDestinationFolder);
-            if (PEAR::isError($res)) {
+            if (PEAR::isError($res) || ($res === false)) {
                 DBUtil::rollback();
-                return PEAR::raiseError(_('Delete Aborted. Unexpected failure to delete document: ') . $oDocument->getName() . $res->getMessage());
+                return PEAR::raiseError(_('Delete Aborted. Unexpected failure to copydocument: ') . $oDocument->getName() . $res->getMessage());
             }
         }
-
-        $oStorage =& KTStorageManagerUtil::getSingleton();
-        $oStorage->removeFolderTree($oStartFolder);
-
-        // documents all cleared.
-        $sQuery = 'DELETE FROM ' . KTUtil::getTableName('folders') . ' WHERE id IN (' . DBUtil::paramArray($aFolderIds) . ')';
-        $aParams = $aFolderIds;
-        
-        $res = DBUtil::runQuery(array($sQuery, $aParams));
-
-        if (PEAR::isError($res)) {
-            DBUtil::rollback();
-            return PEAR::raiseError(_('Failure deleting folders.'));
-        }
         // and store
         DBUtil::commit();
@@ -155,7 +155,7 @@ class Group extends KTEntity {
         $aMembers = array();
         foreach ($aUserIds as $iUserId) {
             $oUser = User::get($iUserId);
-            if ($oUser !== false) {
+            if ((!PEAR::isError($oUser)) && ($oUser !== false)) {
                 $aMembers[] = $oUser;
             }
         }
@@ -170,7 +170,7 @@ class Group extends KTEntity {
         $aMembers = array();
         foreach ($aGroupIds as $iGroupId) {
             $oGroup = Group::get($iGroupId);
-            if ($oGroup !== false) {
+            if ((!PEAR::isError($oUser)) && ($oGroup !== false)) {
                 $aMembers[] = $oGroup;
             }
         }
@@ -62,6 +62,88 @@ class AjaxConditionalAdminDispatcher extends KTAdminDispatcher {
         return $oTemplate->render();
     } 
+    function do_removeFromBehaviour() {
+        $oFieldset =& $this->oValidator->validateFieldset(KTUtil::arrayGet($_REQUEST, 'fieldset_id'));
+        $field_id = KTUtil::arrayGet($_REQUEST, 'field_id'); 
+        $oField =& $this->oValidator->validateField(KTUtil::arrayGet($_REQUEST, 'field_id'));
+        
+        header('Content-type: application/xml');
+        
+        $instances = (array) KTUtil::arrayGet($_REQUEST, 'fieldsToRemove');
+        
+        $this->startTransaction();
+        
+        foreach ($instances as $iInstanceId) {
+            $oInstance = KTValueInstance::get($iInstanceId);
+            if (PEAR::isError($oInstance) || ($oInstance === false)) {
+                $this->rollbackTransaction();
+                return 'Not OK.';
+            }
+            
+            $res = $oInstance->delete();
+            if (PEAR::isError($res) || ($res === false)) {
+                $this->rollbackTransaction();
+                return 'Not OK.';
+            }
+        }
+        
+        $this->commitTransaction();
+        
+        return '<empty>OK.</empty>';
+    }
+    
+    // get the list of ASSIGNED items for a given column, under a certain parent behaviour.
+    function do_getAssignedList() {
+        $parent_behaviour = KTUtil::arrayGet($_REQUEST, 'parent_behaviour'); 
+        //$fieldset_id = KTUtil::arrayGet($_REQUEST, 'fieldset_id'); // 
+        $oFieldset =& $this->oValidator->validateFieldset(KTUtil::arrayGet($_REQUEST, 'fieldset_id'));
+        $field_id = KTUtil::arrayGet($_REQUEST, 'field_id'); 
+        $oField =& $this->oValidator->validateField(KTUtil::arrayGet($_REQUEST, 'field_id'));
+        
+        header('Content-type: application/xml');
+        $oTemplating =& KTTemplating::getSingleton();        
+        $oTemplate =& $oTemplating->loadTemplate('ktcore/metadata/conditional/ajax_complex_get_item_list');
+
+        $aValues = array();
+        $aBehaviours = array();
+        foreach ($oField->getValues() as $oValue) {
+            if (empty($parent_behaviour)) {
+                $oInstance = KTValueInstance::getByLookupSingle($oValue);
+                if (!empty($oInstance)) {
+                    if (is_null($aBehaviours[$oInstance->getBehaviourId()])) {
+                        $aBehaviours[$oInstance->getBehaviourId()] = KTFieldBehaviour::get($oInstance->getBehaviourId());
+                    }
+                    $aValues[$oInstance->getId()] = $oValue->getName() . ' - ' . $aBehaviours[$oInstance->getBehaviourId()]->getName();
+                }
+                // No parent behaviour (thus master column), so any
+                // instance will do to prevent showing this value
+                continue;
+            }
+
+            $iInstanceId = KTValueInstance::getByLookupAndParentBehaviour($oValue, $parent_behaviour, array('ids' => true));
+            
+            if (!empty($iInstanceId)) {
+                
+                $oInstance = KTValueInstance::get($iInstanceId);
+                
+                //print $oInstance->getBehaviourId() . ' - ';
+                //continue;
+                
+                if (is_null($aBehaviours[$oInstance->getBehaviourId()])) {
+                    $aBehaviours[$oInstance->getBehaviourId()] = KTFieldBehaviour::get($oInstance->getBehaviourId());
+                }
+                
+                $aValues[$oInstance->getId()] = $oValue->getName() . ' - ' . $aBehaviours[$oInstance->getBehaviourId()]->getName();
+            }
+        }
+        $aData = array(
+            'values' => $aValues,
+        );
+        $oTemplate->setData($aData);
+        
+        return $oTemplate->render();
+    } 
+    
     function do_getBehaviourList() {
         $parent_behaviour = KTUtil::arrayGet($_REQUEST, 'parent_behaviour'); 
         $fieldset_id = KTUtil::arrayGet($_REQUEST, 'fieldset_id'); 
@@ -19,8 +19,8 @@ class ManageConditionalDispatcher extends KTAdminDispatcher {
         global $default;
         $this->ru = $default->rootUrl;
         // this is not useful:  we _still_ don't chain through the right dispatcher (!)
-        $this->aBreadcrumbs[] = array('url' => $default->rootUrl . '/admin.php/documents', 'name' => _('Document Metadata and Workflow Configuration'));
-        $this->aBreadcrumbs[] = array('url' => $default->rootUrl . '/admin.php/documents/fieldmanagement', 'name' => _('Document Field Management'));
+        $this->aBreadcrumbs[] = array('url' => KTUtil::ktLink('/admin.php','documents'), 'name' => _('Document Metadata and Workflow Configuration'));
+        $this->aBreadcrumbs[] = array('url' => KTUtil::ktLink('/admin.php','documents/fieldmanagement'), 'name' => _('Document Field Management'));
     }
@@ -49,10 +49,11 @@ class ManageConditionalDispatcher extends KTAdminDispatcher {
          *  we can then render in/out.   Everything "intelligent" happens
          *  in AJAX (doing it with submits sucks arse.
          * 
-         *  FIXME we fake it here with nested arrays...
          */
+        
         $oFieldset =& KTFieldset::get($fieldset_id);
         $aFields =& $oFieldset->getFields();
+        
         $this->aBreadcrumbs[] = array(
             'url' => $this->ru . '/admin.php/documents/fieldmanagement',
             'query' => 'action=edit&fFieldsetId=' . $oFieldset->getId(),
@@ -69,7 +70,7 @@ class ManageConditionalDispatcher extends KTAdminDispatcher {
             "context" => &$this,
             "fieldset_id" => $fieldset_id,
             "aFields" => $aFields,
-            "iMasterFieldId" => $aFields[0]->getId(),
+            "iMasterFieldId" => $oFieldset->getMasterFieldId(),
         );
         return $oTemplate->render($aTemplateData);
     }
@@ -104,7 +105,7 @@ class ManageConditionalDispatcher extends KTAdminDispatcher {
             "context" => &$this,
             "fieldset_id" => $fieldset_id,
             "aFields" => $aFields,
-            "iMasterFieldId" => $aFields[0]->getId(),
+            "iMasterFieldId" => $oFieldset->getMasterFieldId(),
         );
         return $oTemplate->render($aTemplateData);
     }
@@ -73,13 +73,22 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
         $aOptions = array('autocomplete' => false);
+        // sometimes even admin is restricted in what they can do.
+
+		$KTConfig =& KTConfig::getSingleton();
+		$minLength = ((int) $KTConfig->get('user_prefs/passwordLength', 6));
+		$restrictAdmin = ((bool) $KTConfig->get('user_prefs/restrictAdminPasswords', false));
+		$passwordAddRequirement = '';
+		if ($restrictAdmin) {
+		     $passwordAddRequirement = ' ' . sprintf('Password must be at least %d characters long.', $minLength);
+		}
         $add_fields = array();
         $add_fields[] =  new KTStringWidget(_('Username'),_('The username the user will enter to gain access to KnowledgeTree.  e.g. <strong>jsmith</strong>'), 'username', null, $this->oPage, true, null, null, $aOptions);
         $add_fields[] =  new KTStringWidget(_('Name'),_('The full name of the user.  This is shown in reports and listings.  e.g. <strong>John Smith</strong>'), 'name', null, $this->oPage, true, null, null, $aOptions);        
         $add_fields[] =  new KTStringWidget(_('Email Address'), _('The email address of the user.  Notifications and alerts are mailed to this address if <strong>email notifications</strong> is set below. e.g. <strong>jsmith@acme.com</strong>'), 'email_address', null, $this->oPage, false, null, null, $aOptions);        
         $add_fields[] =  new KTCheckboxWidget(_('Email Notifications'), _("If this is specified then the user will have notifications sent to the email address entered above.  If it isn't set, then the user will only see notifications on the <strong>Dashboard</strong>"), 'email_notifications', true, $this->oPage, false, null, null, $aOptions);        
-        $add_fields[] =  new KTPasswordWidget(_('Password'), _('Specify an initial password for the user.'), 'password', null, $this->oPage, true, null, null, $aOptions);        
+        $add_fields[] =  new KTPasswordWidget(_('Password'), _('Specify an initial password for the user.') . $passwordAddRequirement, 'password', null, $this->oPage, true, null, null, $aOptions);        
         $add_fields[] =  new KTPasswordWidget(_('Confirm Password'), _('Confirm the password specified above.'), 'confirm_password', null, $this->oPage, true, null, null, $aOptions);        
         // nice, easy bits.
         $add_fields[] =  new KTStringWidget(_('Mobile Number'), _("The mobile phone number of the user.  If the system is configured to send notifications to cellphones, then this number will be SMS'd with notifications.  e.g. <strong>999 9999 999</strong>"), 'mobile_number', null, $this->oPage, false, null, null, $aOptions);        
@@ -162,7 +171,7 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
         $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('User Management'));
         $this->oPage->setBreadcrumbDetails(_('change user password'));
         $this->oPage->setTitle(_("Change User Password"));
-        
+                
         $user_id = KTUtil::arrayGet($_REQUEST, 'user_id');
         $oUser =& User::get($user_id);
@@ -193,11 +202,18 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
         $password = KTUtil::arrayGet($_REQUEST, 'password');
         $confirm_password = KTUtil::arrayGet($_REQUEST, 'confirm_password');        
-        if (empty($password)) { 
+   		$KTConfig =& KTConfig::getSingleton();
+		$minLength = ((int) $KTConfig->get('user_prefs/passwordLength', 6));
+		$restrictAdmin = ((bool) $KTConfig->get('user_prefs/restrictAdminPasswords', false));   
+
+        
+        if ($restrictAdmin && (strlen($password) < $minLength)) {
+		    $this->errorRedirectToMain(sprintf(_("The password must be at least %d characters long."), $minLength));
+		} else if (empty($password)) { 
             $this->errorRedirectToMain(_("You must specify a password for the user."));
         } else if ($password !== $confirm_password) {
             $this->errorRedirectToMain(_("The passwords you specified do not match."));
-        }
+        } 
         // FIXME more validation would be useful.
         // validated and ready..
         $this->startTransaction();
@@ -376,7 +392,14 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
         $password = KTUtil::arrayGet($_REQUEST, 'password');
         $confirm_password = KTUtil::arrayGet($_REQUEST, 'confirm_password');        
-        if (empty($password)) { 
+        $KTConfig =& KTConfig::getSingleton();
+		$minLength = ((int) $KTConfig->get('user_prefs/passwordLength', 6));
+		$restrictAdmin = ((bool) $KTConfig->get('user_prefs/restrictAdminPasswords', false));
+
+        
+        if ($restrictAdmin && (strlen($password) < $minLength)) {
+		    $this->errorRedirectTo('addUser', sprintf(_("The password must be at least %d characters long."), $minLength));
+		} else if (empty($password)) { 
             $this->errorRedirectTo('addUser', _("You must specify a password for the user."));
         } else if ($password !== $confirm_password) {
             $this->errorRedirectTo('addUser', _("The passwords you specified do not match."));
 /* ------------------ generic ------------------ */
+html { 
+    height: 100%;
+}
+
 body
 {
     padding: 1em ; border: 0; margin: 0;
@@ -14,10 +18,12 @@ body
     margin: 0; border: 0; padding: 0;
 }
+/*
 #kt-wrapper
 {
     position: relative;
 }
+*/
 .copyright {
     margin-top: 1em;
@@ -173,8 +179,8 @@ a.main_nav_item {
 {
     position: absolute;
     width: 14em;
-    left: 0;
-    top: 0;
+    left: 1em;
+/*    top: 0; */           /* stupid IE bug:  absolute position ate my scrollbars */
     background: transparent;
     margin: 0 10px 0 0 ;
     border: 0;
@@ -191,6 +191,53 @@ function getPOSTRequest(fullurl) {
     return req;
 }
+function removeFromBehaviour(field_id) {
+    var action = 'removeFromBehaviour';    
+
+    simpleLog('DEBUG','initiating item list update on field '+field_id);
+    
+    var formKeys = Array();
+    var formValues = Array();
+    // action
+    formKeys.push('action');
+    formValues.push(action);
+    
+    // fieldset-id
+    formKeys.push('fieldset_id');
+    formValues.push(getFieldsetId());
+    // field_id
+    formKeys.push('field_id');
+    formValues.push(field_id);
+
+	// get the assigned items that are selected.
+	var column = getColumnForField(field_id);
+	var assigned_sources = getElementsByTagAndClassName('SELECT','assigned_item_list', column);
+	if (assigned_sources.length == 0) {
+	   simpleLog('ERROR','Unable to locate assigned items.');
+	   return;
+	} 
+	var assigned_select = assigned_sources[0];
+	for (var i=0; i<assigned_select.options.length; i++) {
+	    var opt = assigned_select.options[i];
+		if (opt.selected) {
+		    formKeys.push('fieldsToRemove[]');
+			formValues.push(opt.value);
+		}
+	}
+
+
+    // boilerplate.
+    var POSTval = queryString(formKeys, formValues);
+    var req = getPOSTRequest(targeturl);
+    simpleLog('DEBUG','sending request (to '+targeturl+'): \n'+repr(map(null, formKeys, formValues))+'\nqueryString: '+POSTval);
+    var deferred = sendXMLHttpRequest(req, POSTval);
+    deferred.addCallback(partial(do_removeItems, field_id));
+    deferred.addErrback(handleError);
+}
+
+function do_removeItems(field_id, req) {
+    updateItemListForField(field_id);
+}
 // updates the item list for a given field to the items which are "free".
 function updateItemListForField(field_id) { 
@@ -226,6 +273,39 @@ function updateItemListForField(field_id) {
     var deferred = sendXMLHttpRequest(req, POSTval);
     deferred.addCallback(partial(do_updateItemList, field_id));
     deferred.addErrback(handleError);
+	
+	
+	
+	
+	action = 'getAssignedList';
+	
+	formKeys = Array();
+	formValues = Array();
+	
+	formKeys.push('action');
+    formValues.push(action);
+    // we need the fixed parent (or null - both are equivalent).
+    formKeys.push('parent_behaviour');
+    if (fixed_value == null) {
+       formValues.push('');
+    } else {
+        formValues.push(fixed_value);
+    }
+    // fieldset-id
+    formKeys.push('fieldset_id');
+    formValues.push(getFieldsetId());
+    // field_id
+    formKeys.push('field_id');
+    formValues.push(field_id);
+
+
+    // boilerplate.
+    POSTval = queryString(formKeys, formValues);
+    req2 = getPOSTRequest(targeturl);
+    simpleLog('DEBUG','sending request (to '+targeturl+'): \n'+repr(map(null, formKeys, formValues))+'\nqueryString: '+POSTval);
+    var deferred2 = sendXMLHttpRequest(req2, POSTval);
+    deferred2.addCallback(partial(do_updateAssignedItemList, field_id));
+    deferred2.addErrback(handleError);
  }
 // updates the available behaviours for a given field.
@@ -459,6 +539,34 @@ function do_updateItemList(field_id, req) {
     replaceChildNodes(item_select, itemNodes);
 }
+
+function do_updateAssignedItemList(field_id, req) {
+    simpleLog('DEBUG','entering callback for assigned-item-list update.');
+    var items = req.responseXML.getElementsByTagName('item');
+	
+    var itemNodes = Array();
+    for (var i=0; i<items.length; i++) {
+        var item = items[i];
+        itemNodes.push(createDOM('option',{'value':item.getAttribute('value')},item.getAttribute('label')));
+    }
+    // now, find the array and replaceChildNodes() it.
+    var column = getColumnForField(field_id);
+	var assigned_wrapper = getElementsByTagAndClassName('DIV','assigned_items',column)[0];
+	
+	if (itemNodes.length == 0) {
+		setElementClass(assigned_wrapper, 'assigned_items empty');
+	} else { setElementClass(assigned_wrapper, 'assigned_items'); }
+	
+	
+    var is_sources = getElementsByTagAndClassName('select','assigned_item_list',column);
+    if (is_sources.length == 0) {
+        simpleLog('ERROR','Could not find the assigned item list in field '+field_id);
+        return;
+    }
+    var item_select = is_sources[0];
+    replaceChildNodes(item_select, itemNodes);
+}
+
 function do_updateBehaviours(field_id, req) {
     simpleLog('DEBUG','entering callback for behaviour-lists update.');
     // we handle this slightly differently to updateItemList.
@@ -17,6 +17,16 @@ function getColumnForField(field_id) {
     return getElement('md_'+field_id);
 }
+function getButtonsForField(field_id) {
+    return getElement('buttons_'+field_id);
+}
+
+function getNameForField(field_id) {
+    var h = getElement('header_'+field_id);
+    //alert(field_id);
+    return scrapeText(h);
+}
+
 function getFieldIdFromColumn(column) {
     return column.id.substr(3,column.id.length);
 }
@@ -29,6 +39,7 @@ function setActiveFields(active_fields) {
         var column = getColumnForField(active_fields[i]);
         setElementClass(column, 'active');
     }
+    
 }
 // takes a field, and sets all items in active_lookups to be active.  other items are deleted.
@@ -99,13 +110,13 @@ function do_handleAjaxError(err_source, err) {
 }
 // from a selected_lookup, get the fixed_field and pass through, getting the items that selection currently activates.
-function updateActiveLookups(selected_lookup) {
+function updateActiveLookups(selected_lookup, lookup_label) {
    simpleLog('DEBUG','function updateActiveLookups called.');
    var req = getXMLHttpRequest();
    req.open('GET',target_url+'?action=updateActiveLookups&active_field='+current_fixed+'&selected_lookup='+selected_lookup, true);
    var deferred = sendXMLHttpRequest(req);
-   deferred.addCallback(do_updateActiveLookups);
+   deferred.addCallback(partial(do_updateActiveLookups, lookup_label));
    deferred.addErrback(partial(do_handleAjaxError, 'updateActiveLookups'));
 }
@@ -152,7 +163,7 @@ function storeRelationship(selected_lookup, child_lookups) {
   // inform the user that something has happened.
   // FIXME this isn't i18n friendly.
-  addInformationNote('Values updated at ' + new Date());
+  addInformationNote('Dependencies saved. (at ' + new Date() + ')');
   deferred.addCallback(do_updateActiveLookups);
   deferred.addErrback(partial(do_handleAjaxError, 'storeRelationship'));
@@ -187,7 +198,7 @@ function do_updateActiveFields(req) {
 // should receive a simple-enough set of "field" elements, 
 // filled with "lookup" items. 
-function do_updateActiveLookups(req) {
+function do_updateActiveLookups(label, req) {
    simpleLog('DEBUG','AJAX function do_updateActiveLookups triggered');
    var active_fields = Array();
    var incoming_fields = req.responseXML.getElementsByTagName('field');
@@ -211,6 +222,8 @@ function do_updateActiveLookups(req) {
             setActiveLookupsForField(active_fields[i].field_id, active_fields[i].lookups);
         }
    }
+   
+   addInformationNote('Dependencies for value "'+label+' loaded."(at ' + new Date() + ')');
 }
@@ -220,19 +233,27 @@ function setExclusiveEditing(field_id) {
     var rootItem = getConditionalTable();
     var columns = rootItem.getElementsByTagName('TD');
     for (var i=0; i<columns.length; i++) {
-        setElementClass(columns[i], 'inactive');
-        var item_list = getElementsByTagAndClassName('SELECT','item_list',columns[i])[0];   // FIXME catch potential failure here (pathalogical)
-        item_list.multiple=true;
-        updateNodeAttributes(item_list, {'onchange':null});
+        var col = columns[i];
+        if (hasElementClass(col, "buttonset")) { setElementClass(col, 'buttonset inactive'); }
+        else {
+            setElementClass(columns[i], 'inactive');
+            var item_list = getElementsByTagAndClassName('SELECT','item_list',columns[i])[0];   // FIXME catch potential failure here (pathalogical)
+            item_list.multiple=true;
+            updateNodeAttributes(item_list, {'onchange':null});
+        }
     }
     // get the "right" column.
     var column = getColumnForField(field_id);
+    simpleLog('DEBUG','setExclusiveEditing found column' + column + ' for id ' + field_id);
     setElementClass(column, 'active editing');
     var item_list = getElementsByTagAndClassName('SELECT','item_list',column)[0];   // FIXME catch potential failure here (pathalogical)            
     item_list.multiple = false;
     updateNodeAttributes(item_list, {'onchange':partial(handleChangedSelection, field_id, item_list)});
+    var buttons = getButtonsForField(field_id);
+    setElementClass(buttons, 'buttonset active editing');
+
     simpleLog('ERROR','setExclusiveEditing needs to alter the options so nothing is selected.');
 }
@@ -248,6 +269,7 @@ function editSimpleField(field_id) {
     setExclusiveEditing(field_id);
     updateActiveFields(); // trigger an update of the backend.
     // rest is asynchronous.
+    addInformationNote('Now editing field "'+getNameForField(field_id)+'".');
 }
@@ -279,7 +301,8 @@ function finishSimpleField(field_id) {
 // called when a single-view dropdown is activated.
 function handleChangedSelection(field_id, select_input) {
-    updateActiveLookups(select_input.value);    // handles everything for us.
+    addInformationNote('Loading Dependencies for value "'+scrapeText(select_input.options[select_input.selectedIndex])+'"(at ' + new Date() + ')');
+    updateActiveLookups(select_input.value, scrapeText(select_input.options[select_input.selectedIndex]));    // handles everything for us.
 }
 // push onto the "fixed" stack the field which is being edited at the moment.
@@ -15,6 +15,12 @@
 .inactive .behaviour_edit_options 
 { display: none; }
+.inactive .assigned_items { display: none; }
+
+.assigned_items.empty select { display: none; }
+.assigned_items.empty .assigned_items_message { display: block; color: #666; }
+.assigned_items_message { display: none; }
+
 .helpText { color: #666; }
 {/literal}
 {/capture}
@@ -36,6 +42,17 @@ addLoadEvent(updateActiveFields);
 {$context->oPage->requireJSStandalone($sJS)}
 <h2>{i18n}Edit Complex Conditional Metadata{/i18n}</h2>
+
+<p class="descriptiveText">Complex Conditional Metadata depends on what are 
+called "behaviours".  Essentially, behaviours are assigned to a <strong>single</strong>
+field, and can contain any number of values that are available in that field.  Each field
+can have multiple behaviours assigned to it.</p>
+
+<p class="descriptiveText important">Each behaviour can cause a number of other behaviours &mdash; in
+the field's <strong>child</strong> fields &mdash; to become available.  By assigning values
+to behaviours, and creating relationships between behaviours, you can create extremely complex 
+relationships between available lookup values.</p>
+
 <form method="POST" action="{$smarty.server.PHP_SELF}">
 <input type="hidden" name="fieldset_id" id="global-fieldset-id" value="{$fieldset_id}" />
@@ -54,6 +71,21 @@ addLoadEvent(updateActiveFields);
 	<h3>{$oField->getName()}</h3>
      <p class="inactivity_message">{i18n}This column is not active.{/i18n}</p>
      <p class="fixed_message">{i18n}Editing behaviour <strong>Jack</strong>{/i18n}</p>
+	 <div class="assigned_items">
+	 <h3>{i18n}Assigned Items{/i18n}</h3>
+	     <select class="assigned_item_list" multiple="true">
+		  <!--     These are orphaned - we fire a "activate" command on load / available.
+            <option value="-1">Test 1</option>
+            <option value="-2">Test 2</option>
+            <option value="-3">Test 3</option>
+            <option value="-4">Test 4</option>
+		  -->
+         </select>	 
+		 <br /><input class="assigned_item_list" type="button" value="{i18n}remove behaviour{/i18n}" onclick="removeFromBehaviour({$oField->getId()});" />
+		 <p class="assigned_items_message">No items have been assigned with the current
+		 parent behaviour.</p>
+	 </div>
+	 
      <div class="unassigned_items">
      <h3>{i18n}Unassigned/Unavailable{/i18n}</h3>
          <select class="item_list" multiple="true">
@@ -93,9 +125,7 @@ addLoadEvent(updateActiveFields);
          <option value="4">Behaviour 4</option>
 		 -->
          </select>
-     <br />
-     <a href="#" onclick="changeAssignments({$oField->getId()}); return
-false;">{i18n}Change Assignments for this field.{/i18n}</a>
+
      </div>
   </td>
 {/foreach}
@@ -3,16 +3,20 @@
 /* inactivity */
 .active .inactivity_message { display: none; }
+select { width: 100%; }
+
+.edit_button { margin-bottom: 0.5em; }
 .save_button,
-.done_button { display: none; }
+.done_button { display: none; margin-bottom: 0.5em;}
 .active.editing .save_button,
 .active.editing .done_button { display: block; }
 .active.editing .edit_button { display: none; }
-
 .active { position: relative; }
+td { vertical-align: top; }
+.buttonset.inactive { background: transparent; }
 .inactive { background: #ccc; position: relative; }
 .inactive .fixed_message, 
@@ -61,14 +65,24 @@ addLoadEvent(partial(editSimpleField, {$iMasterFieldId}));
 <h2>{i18n}Editing Fieldset Rules (Simple){/i18n}</h2>
+<p class="descriptiveText">To make a value in a <strong>child field</strong>available to the user when another value is 
+selected in a <strong>parent field</strong>, first ensure that the parent field is being edited (it will have "save" and "done" 
+as the buttons at the bottom of the column) and then select the value for the parent field.  Now select the value(s) in 
+the child column(s) you wish to be available to the user when the parent field's value is selected,
+and click "save".  Note you that you can use Ctrl-&lt;click&gt; to select multiple child values
+at the same time.</p>
+
+<p class="descriptiveText important">Changes made here are stored immediately, without you needing to
+refresh the page.</p>
+
 <form method="POST" action="{$smarty.server.PHP_SELF}">
 <input type="hidden" name="fieldset_id" id="global-fieldset-id" value="{$fieldset_id}" />
 <table id="simple_conditional_edit">
 <tr>
-  <th>Column 1</th>
-  <th>Column 2</th>
-  <th>Column 3</th>
+{foreach from=$aFields item=oField}
+  <th id="header_{$oField->getId()}">{$oField->getName()}</th>
+{/foreach}
 </tr>
 <tr valign="top">
@@ -76,22 +90,28 @@ addLoadEvent(partial(editSimpleField, {$iMasterFieldId}));
   <td class="inactive" id="md_{$oField->getId()}">
      <p class="inactivity_message">{i18n}This field is not controlled by the currently active group.{/i18n}</p>
      <div class="lookup_items">
-     <h3>Field: {$oField->getName()}</h3>
          <select class="item_list">
   {foreach from=$oField->getValues() item=oMetaData}
 				<option value="{$oMetaData->getId()}">{$oMetaData->getName()|escape}</option>
   {/foreach}
            </select>
-         <div class="buttonset">
-             <input type="button" value="{i18n}edit{/i18n}" class="edit_button" onclick="editSimpleField({$oField->getId()})" />
-             <input type="button" value="{i18n}save{/i18n}" class="save_button" onclick="saveSimpleField({$oField->getId()})" />
-             <input type="button" value="{i18n}done{/i18n}" class="done_button" onclick="finishSimpleField({$oField->getId()})" />
-         </div>
+
      </div>
   </td>
 {/foreach}
 </tr>
+<tr>
+{foreach from=$aFields item=oField}
+   <td class="buttonset" id="buttons_{$oField->getId()}">
+         <div class="form_actions">
+             <input type="button" value="{i18n}edit field{/i18n}" class="edit_button" onclick="editSimpleField({$oField->getId()})" />
+             <input type="button" value="{i18n}save this dependency{/i18n}" class="save_button" onclick="saveSimpleField({$oField->getId()})" />
+             <input type="button" value="{i18n}finished with this field{/i18n}" class="done_button" onclick="finishSimpleField({$oField->getId()})" />
+         </div>
+   </td>
+{/foreach}		 
+</tr>
 </table>
 <!--
 <table id="brad-log">
 <h2>{i18n}Manage conditional fieldset{/i18n}</h2>
+<p class="descriptiveText">Conditional fieldsets allow you to restrict the options
+a user has for values in some fields based on the values in other fields.  There
+are two kinds of conditional fieldsets:  <strong>Simple</strong> and <strong>Complex</strong>
+.  Simple fieldsets should be sufficient for most things:  they allow you to say that 
+the values of one field are restricted to a certain subset of values if another field
+has a specific value.  For example, you could say that if the field "Street" is "Jeffrey", 
+then the field "Residents" must be one of "Jones","Smith" or "Friedman".</p>
+
+<p class="descriptiveText">Complex fieldsets allow you to give far more detailed structure to
+your information:  The value of "Residents" can depend not only on "Street", but on
+how the user was allowed to select the specific street (given another field).</p>
+
+{* don't show warnings until the basics are done. *}
+
+{if ($oMasterField && empty($free_fields))}
 {if $sIncomplete || !$oFieldset->getIsComplete()}
-<div class="ktError">
+<div class="ktInfo">
 <p>{i18n}This conditional fieldset is marked such that it
 cannot be used.  This happens when the fieldset has been edited and has
 not been set to complete.  Setting the fieldset to complete will do a
 check to see if the fieldset is usable by the user.{/i18n}</p>
 </div>
+{/if}
 {if $sIncomplete}
 <div class="ktError">
@@ -27,9 +43,12 @@ to complete{/i18n}: {$sIncomplete|escape}&lt;/p&gt;
 <h2>{i18n}Conditional type{/i18n}</h2>
 {if $oFieldset->getIsComplex()}
-<p>{i18n}Complex{/i18n}: <a
+<p>{i18n}The fieldset is currently designated as <strong>Complex</strong>{/i18n}</p> 
+
+{if ($oMasterField && empty($free_fields))}<p><a
+class="ktActionLink ktEdit"
 href="{$rootUrl}/plugins/ktcore/admin/manageConditionals.php?action=editComplexFieldset&fieldset_id={$oFieldset->getId()}">{i18n}Manage
-complex conditional{/i18n}</a></p>
+complex conditional{/i18n}</a></p>{/if}
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <input type="hidden" name="action" value="changeToSimple" />
@@ -39,9 +58,13 @@ complex conditional{/i18n}&lt;/a&gt;&lt;/p&gt;
 {else}
-<p>{i18n}Simple{/i18n}: <a
+<p>{i18n}The fieldset is currently designated as <strong>Simple</strong>{/i18n}</p> 
+
+{if ($oMasterField && empty($free_fields))}<p><a
+class="ktActionLink ktEdit"
 href="{$rootUrl}/plugins/ktcore/admin/manageConditionals.php?action=editFieldset&fieldset_id={$oFieldset->getId()}">{i18n}Manage simple conditional{/i18n}</a>
 </p>
+{/if}
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <input type="hidden" name="action" value="changeToComplex" />
@@ -54,9 +77,10 @@ href=&quot;{$rootUrl}/plugins/ktcore/admin/manageConditionals.php?action=editFieldset
 <p>{i18n}Changing the conditional type set will remove all existing field
 ordering!{/i18n}</p>
-<h2>Master field</h2>
+
 {if !$oMasterField}
+<h2>Master field</h2>
 {i18n}No master field is set, please select the master field{/i18n}:
 <form action="{$smarty.server.PHP_SELF}" method="POST">
@@ -70,15 +94,26 @@ ordering!{/i18n}&lt;/p&gt;
 {else}
 <form action="{$smarty.server.PHP_SELF}" method="POST">
+<fieldset>
+<legend>Master field</legend>
 <input type="hidden" name="action" value="setMasterField" />
 <input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}" />
+<p class="descriptiveText">In order to have a chain of conditions, one initial field
+must be shown to the user.  This is called the <strong>master field</strong>.</p>
+
+<div class="form">
+<p class="descriptiveText important">{i18n}Changing the master field set will remove all existing field
+ordering!{/i18n}</p>
 {entity_select entities=$oFieldset->getFields() name="fFieldId" selected=$oMasterField->getId()}
+</div>
+<div class="form_actions">
 <input type="submit" name="submit" value="{i18n}Change master field{/i18n}" />
+</div>
+</fieldset>
 </form>
-<p>{i18n}Changing the master field set will remove all existing field
-ordering!{/i18n}</p>
+
 <h2>{i18n}Field ordering{/i18n}</h2>
@@ -92,30 +127,38 @@ $this-&gt;assign(&quot;oParentField&quot;, DocumentField::get($this-&gt;_tpl_vars[&#39;aRow&#39;][&#39;paren
 $this->assign("oChildField", DocumentField::get($this->_tpl_vars['aRow']['child_field_id']));
 {/php}
   <li>
-<span title="Field Id {$oParentField->getId()}">Field {$oParentField->getName()|escape}</span>
-affects the values available in
-<span title="Field Id {$oChildField->getId()}">field {$oChildField->getName()|escape}</span>
+    {$oParentField->getName()|escape}
+<span class="descriptiveText">controls the values available in</span> 
+    {$oChildField->getName()|escape}
 </li>
 {/foreach}
 </ul>
 {/if}
 { if $free_fields }
-<h3>{i18n}Order fields{/i18n}</h2>
+
 <form action="{$smarty.server.PHP_SELF}" method="POST">
+<fieldset>
 <input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}" />
 <input type="hidden" name="action" value="orderFields" />
-The available values of the selected fields:
-<br />
-{entity_select entities=$free_fields name="fFreeFieldIds[]" multiple="yes"}
-<br />
-are conditional on the values of this field:
-<br />
+<legend>{i18n}Order Fields{/i18n}</legend>
+
+<div class="field">
+<p class="descriptiveText">The value of the field</p>
 {entity_select entities=$parent_fields name="fParentFieldId"}
-<br />
+</div>
+
+<div class="field">
+<p class="descriptiveText">controls the values of the following fields</p>
+{entity_select entities=$free_fields name="fFreeFieldIds[]" multiple="yes"}
+</div>
+
+<div class="form_actions">
 <input type="submit" name="submit" value="{i18n}Order{/i18n}" />
+</div>
+</fieldset>
 </form>
 {/if}
@@ -20,6 +20,10 @@ while the workflow has no documents or document-versions assigned to the workflo
 </fieldset>
+{if (empty($workflow_info.transitions))}
+<div class="ktInfo"><p>This workflow does not define any transitions.  Use the "Create a new transition" link above
+to add new transitions.</p></div>
+{else}
 <h3>{i18n}Transition Availability{/i18n}</h3>
 <p class="descriptiveText">Click on any transition below to edit it directly,
@@ -66,3 +70,4 @@ or use the checkboxes to assign which states the transition is available from.&lt;/
 </div>
 </form>
+{/if}
 \ No newline at end of file