Peter M. Groen / knowledgetree

Commit 6f5a7a060866e56d2ea3855dbc8b92241c682934

Authored by Neil Blakey-Milner
1 parent 2826623e

KTS-257: Get the list of available fieldsets more accurately. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4749 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 6 additions and 4 deletions
plugins/ktcore/admin/documentTypes.php
  View file @6f5a7a0
... ... @@ -37,7 +37,7 @@ class KTDocumentTypeDispatcher extends KTAdminDispatcher {
37 37 $oDocumentType =& DocumentType::createFromArray(array(
38 38 'name' => $sName,
39 39 ));
40   -
  40 +
41 41 if (PEAR::isError($oDocumentType)) {
42 42 $this->errorRedirectToMain(_('Could not create document type'));
43 43 exit(0);
... ... @@ -102,12 +102,14 @@ class KTDocumentTypeDispatcher extends KTAdminDispatcher {
102 102  
103 103  
104 104 $aCurrentFieldsets =& KTFieldset::getForDocumentType($oDocumentType);
  105 + $aCurrentFieldsetIds = array_map(array("KTUtil", "getId"), $aCurrentFieldsets);
105 106 $aAvailableFieldsets =& KTFieldset::getNonGenericFieldsets();
106   - $aAvailableFieldsets = array_diff($aAvailableFieldsets, $aCurrentFieldsets);
107   -
  107 + $aAvailableFieldsetIds =& array_map(array("KTUtil", "getId"), $aAvailableFieldsets);
  108 + $aAvailableFieldsetIds = array_diff($aAvailableFieldsetIds, $aCurrentFieldsetIds);
108 109  
109 110 $vocab = array();
110   - foreach ($aAvailableFieldsets as $oFieldset) {
  111 + foreach ($aAvailableFieldsetIds as $iFieldsetId) {
  112 + $oFieldset = KTFieldset::get($iFieldsetId);
111 113 $vocab[$oFieldset->getId()] = $oFieldset->getName();
112 114 }
113 115 $aOptions = array();
... ...