Peter M. Groen / knowledgetree

Commit 43e02466371c79db2f358e832468406346d48c8b

Authored by bshuttle
1 parent 009770d5

conditional metadata didn't work. 

surprise.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4312 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 4 changed files with 19 additions and 3 deletions
lib/metadata/metadatautil.inc.php
  View file @43e0246
@@ -136,7 +136,14 @@ class KTMetadataUtil { @@ -136,7 +136,14 @@ class KTMetadataUtil {
136 136
137 $oMasterField =& DocumentField::get($oFieldset->getMasterFieldId()); 137 $oMasterField =& DocumentField::get($oFieldset->getMasterFieldId());
138 $aSelectedFields = array_keys($aCurrentSelections); 138 $aSelectedFields = array_keys($aCurrentSelections);
139 - $oValueInstance = KTValueInstance::getByLookupSingle($aCurrentSelections[$oMasterField->getId()]); 139 +
  140 + $field = $oMasterField->getId();
  141 + $val = $aCurrentSelections[$field];
  142 + $lookup = MetaData::getByValueAndDocumentField($val, $field);
  143 +
  144 + $oValueInstance = KTValueInstance::getByLookupSingle($lookup);
  145 +
  146 +
140 147
141 $aValues = KTMetadataUtil::_getNextForBehaviour($oValueInstance->getBehaviourId(), $aCurrentSelections); 148 $aValues = KTMetadataUtil::_getNextForBehaviour($oValueInstance->getBehaviourId(), $aCurrentSelections);
142 $GLOBALS['default']->log->debug('KTMetadataUtil::getNext, values are ' . print_r($aValues, true)); 149 $GLOBALS['default']->log->debug('KTMetadataUtil::getNext, values are ' . print_r($aValues, true));
presentation/lookAndFeel/knowledgeTree/js/conditional_usage.js
  View file @43e0246
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 3
4 function getBindTarget(fieldset) { 4 function getBindTarget(fieldset) {
5 var possibles = getElementsByTagAndClassName('DIV','conditional_target', fieldset); 5 var possibles = getElementsByTagAndClassName('DIV','conditional_target', fieldset);
  6 +
6 return possibles[0]; 7 return possibles[0];
7 } 8 }
8 9
@@ -272,7 +273,8 @@ function clearUnfixedWidgets(fieldset) { @@ -272,7 +273,8 @@ function clearUnfixedWidgets(fieldset) {
272 */ 273 */
273 274
274 function updateFieldset(fieldset) { 275 function updateFieldset(fieldset) {
275 - var targeturl = '/presentation/lookAndFeel/knowledgeTree/ajaxConditional.php'; // test_metadata_update.txt'; 276 + var baseurl = getElement('kt-core-baseurl').value;
  277 + var targeturl = baseurl + '/presentation/lookAndFeel/knowledgeTree/ajaxConditional.php'; // test_metadata_update.txt';
276 simpleLog('DEBUG','AJAX function called: updateFieldset'); 278 simpleLog('DEBUG','AJAX function called: updateFieldset');
277 279
278 var formdata = parseFieldsetToForm(fieldset); 280 var formdata = parseFieldsetToForm(fieldset);
templates/kt3/fieldsets/conditional_editable.smarty
  View file @43e0246
@@ -10,3 +10,7 @@ @@ -10,3 +10,7 @@
10 </div> 10 </div>
11 11
12 </fieldset> 12 </fieldset>
  13 +<!--
  14 +<table id="brad-log"><tbody></tbody>
  15 +</table>
  16 +-->
13 \ No newline at end of file 17 \ No newline at end of file
templates/ktcore/document/add.smarty
  View file @43e0246
@@ -14,7 +14,9 @@ @@ -14,7 +14,9 @@
14 {capture assign=sJavascript} 14 {capture assign=sJavascript}
15 {literal} 15 {literal}
16 function swapInItem(elementId, req) { 16 function swapInItem(elementId, req) {
  17 +
17 var cp = getElement(elementId); 18 var cp = getElement(elementId);
  19 +
18 cp.innerHTML = req.responseText; 20 cp.innerHTML = req.responseText;
19 initialiseConditionalFieldsets(); 21 initialiseConditionalFieldsets();
20 } 22 }
@@ -28,11 +30,12 @@ function swapElementFromRequest(elementId, url) { @@ -28,11 +30,12 @@ function swapElementFromRequest(elementId, url) {
28 deff.addCallback(partial(swapInItem, elementId)); 30 deff.addCallback(partial(swapInItem, elementId));
29 var cp = getElement(elementId); 31 var cp = getElement(elementId);
30 cp.innerHTML="loading..."; 32 cp.innerHTML="loading...";
  33 +
31 } 34 }
32 35
33 function getMetadataForType(id) { 36 function getMetadataForType(id) {
34 swapElementFromRequest('type_metadata_fields', 37 swapElementFromRequest('type_metadata_fields',
35 - 'http://{/literal}{$config->get('KnowledgeTree/serverName')}{literal}/presentation/lookAndFeel/knowledgeTree/documentmanagement/getTypeMetadataFields.php?fDocumentTypeID=' 38 + '{/literal}{$rootUrl}{literal}/presentation/lookAndFeel/knowledgeTree/documentmanagement/getTypeMetadataFields.php?fDocumentTypeID='
36 + id); 39 + id);
37 } 40 }
38 41