KTC-524

"When Editing Fieldset Rules for Conditional Fieldset, clicking edit field displays incorrect control/dependent group, inconsistent with configured Field Ordering" Fixed. Removed the stack. Committed by: Megan Watson Reviewed by: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@9034 c91229c3-7414-0410-bfa2-8a42b809f60b

KTC-524
"When Editing Fieldset Rules for Conditional Fieldset, clicking edit field displays incorrect control/dependent group, inconsistent with configured Field Ordering" Fixed. Removed the stack. Committed by: Megan Watson Reviewed by: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@9034 c91229c3-7414-0410-bfa2-8a42b809f60b
Megan Watson
1 parent a56cfc9c
Showing 2 changed files with 37 additions and 37 deletions
resources/js/conditional_simple_edit.js
templates/ktcore/metadata/conditional/editsimple.smarty
 /* Model Functions
  *
- * Perform various and sundry operations on the edit-page. 
+ * Perform various and sundry operations on the edit-page.
  */
  
  
@@ -44,7 +44,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.
@@ -94,17 +94,17 @@ function getActiveLookups() {
                 }
             }
         }
-    }    
+    }
     return active_lookups;
 }
  
 /** Simple edit: AJAX component */
 // extract the "fixed" field, and identify which fields (if any) are active.
 function updateActiveFields() {
-   
+
    simpleLog('DEBUG','function updateActiveFields called.');
    var req = getXMLHttpRequest();
-   
+
    req.open('GET',getTargetUrl()+'?action=updateActiveFields&active_field='+current_fixed, true);
    var deferred = sendXMLHttpRequest(req);
    deferred.addCallback(do_updateActiveFields);
@@ -117,7 +117,7 @@ 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, lookup_label) {
-   
+
    simpleLog('DEBUG','function updateActiveLookups called.');
    var req = getXMLHttpRequest();
    req.open('GET',getTargetUrl()+'?action=updateActiveLookups&active_field='+current_fixed+'&selected_lookup='+selected_lookup, true);
@@ -127,9 +127,9 @@ function updateActiveLookups(selected_lookup, lookup_label) {
 }
  
 // send a "save" request to the backend, asking it to make the child_lookups the only items parented
-// to the selected_lookup (include field_id for selected, and fieldset). 
+// to the selected_lookup (include field_id for selected, and fieldset).
 function storeRelationship(selected_lookup, child_lookups) {
-  
+
   var formKeys = Array();
   var formValues = Array();
  
@@ -170,7 +170,7 @@ function storeRelationship(selected_lookup, child_lookups) {
   // inform the user that something has happened.
   // FIXME this isn't i18n friendly.
   addInformationNote(_('Dependencies saved. (at ') + new Date() + ')');
-  
+
   deferred.addCallback(do_updateActiveLookups);
   deferred.addErrback(partial(do_handleAjaxError, 'storeRelationship'));
 }
@@ -185,7 +185,7 @@ function addInformationNote(message) {
     var sH = secondHeaders[0];
     contentBox.insertBefore(dynamicMessage, sH);
   }
-  
+
   var newStr = createDOM('P',null,message);
   replaceChildNodes(dynamicMessage, newStr);
 }
@@ -197,20 +197,20 @@ function do_updateActiveFields(req) {
    var incoming_fields = req.responseXML.getElementsByTagName('active');
    for (var i=0; i<incoming_fields.length; i++) {
         active_fields.push(incoming_fields[i].getAttribute('field_id'));
-   }    
+   }
    simpleLog('DEBUG','do_updateActiveFields found active fields: '+repr(active_fields));
    setActiveFields(active_fields);
 }
  
-// should receive a simple-enough set of "field" elements, 
-// filled with "lookup" items. 
+// should receive a simple-enough set of "field" elements,
+// filled with "lookup" items.
 function do_updateActiveLookups(label, req) {
    simpleLog('DEBUG','AJAX function do_updateActiveLookups triggered');
    var active_fields = Array();
    var incoming_fields = req.responseXML.getElementsByTagName('field');
    for (var i=0; i<incoming_fields.length; i++) {
         var field = incoming_fields[i];
-        
+
         var field_id = field.getAttribute('field_id');
         simpleLog('DEBUG','found field: '+field_id);
         var infoset = {'field_id':field_id, 'lookups':new Array()};
@@ -228,7 +228,7 @@ function do_updateActiveLookups(label, req) {
             setActiveLookupsForField(active_fields[i].field_id, active_fields[i].lookups);
         }
    }
-   
+
    addInformationNote(_('Dependencies for value "')+label+('" loaded.(at ') + new Date() + ')');
 }
  
@@ -253,7 +253,7 @@ function setExclusiveEditing(field_id) {
     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)            
+    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)});
  
@@ -287,8 +287,8 @@ function saveSimpleField(field_id) {
     if (item_list_select.length == 0) {
         simpleLog('ERROR','no item_list select found in field '+field_id);
         return false;
-    } 
-    // else 
+    }
+    // else
     var selected_lookup = item_list_select[0].value;
     simpleLog('DEBUG','extracted selected lookup of '+selected_lookup);
  
@@ -318,8 +318,11 @@ function handleChangedSelection(field_id, select_input) {
 var undoStack = Array();        // stores the field_ids.
 var current_fixed = null;       // current fixed.  saves a bit of time...
 function pushUndoStack(field_id) {
-    simpleLog('DEBUG','untested function pushUndoStack called.');   
-    if (current_fixed == null) { 
+    current_fixed = field_id;
+    return false;
+
+    simpleLog('DEBUG','untested function pushUndoStack called.');
+    if (current_fixed == null) {
         current_fixed = field_id;
         return false;
         // pre-initialisation.
@@ -332,23 +335,23 @@ function pushUndoStack(field_id) {
     } else {
         return false; // pass
     }
-    simpleLog('DEBUG','undoStack is now: '+repr(undoStack));   
+    simpleLog('DEBUG','undoStack is now: '+repr(undoStack));
     current_fixed=field_id;
 }
  
-function popUndoStack() { 
-    simpleLog('DEBUG','function popUndoStack called.');       
+function popUndoStack() {
+    simpleLog('DEBUG','function popUndoStack called.');
     if (undoStack.length == 0 ) {
-        simpleLog('ERROR','undo stack popped at 0.  This should be impossible');       
+        simpleLog('ERROR','undo stack popped at 0.  This should be impossible');
         return false;
     }
     var targetFixed = undoStack.pop();
     current_fixed = targetFixed;
     setExclusiveEditing(targetFixed);
-    updateActiveFields(); // trigger an update of the backend.    
+    updateActiveFields(); // trigger an update of the backend.
     if (undoStack.length == 0) {
         undoStack.push(targetFixed);
-        simpleLog('ERROR','undo stack popped to 0, re-pushing this last item. ');       
+        simpleLog('ERROR','undo stack popped to 0, re-pushing this last item. ');
     }
-    simpleLog('DEBUG','undoStack is now: '+repr(undoStack));   
+    simpleLog('DEBUG','undoStack is now: '+repr(undoStack));
 }
@@ -20,10 +20,10 @@ td { vertical-align: top; }
 .buttonset.inactive { background: transparent; }
  
 .inactive { background: #ccc; }
-.inactive .fixed_message, 
+.inactive .fixed_message,
 .inactive .unassigned_items,
 .inactive .available_behaviours,
-.inactive .behaviour_edit_options 
+.inactive .behaviour_edit_options
 {
    display: none;
 }
@@ -61,9 +61,9 @@ addLoadEvent(partial(editSimpleField, {$iMasterFieldId}));
  
 <h2>{i18n}Editing Fieldset Rules (Simple){/i18n}</h2>
  
-<p class="descriptiveText">{i18n}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 
+<p class="descriptiveText">{i18n}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.{/i18n}</p>
@@ -98,7 +98,7 @@ refresh the page.{/i18n}&lt;/p&gt;
      </div>
   </td>
 {/foreach}
-  
+
 </tr>
 </tbody>
 <tfoot>
@@ -108,12 +108,9 @@ refresh the page.{/i18n}&lt;/p&gt;
          <div class="form_actions">{capture assign=fid}{$oField->getId()}{/capture}
              {if (!empty($ordering.$fid))}<input type="button" value="{i18n}edit field{/i18n}" class="edit_button" onclick="editSimpleField({$oField->getId()})" />{/if}
              <input type="button" value="{i18n}save this dependency{/i18n}" class="save_button" onclick="saveSimpleField({$oField->getId()})" />
-			 {if ($iMasterFieldId != $oField->getId())} {* Only for non-initial fields. *}
-             <input type="button" value="{i18n}finished with this field{/i18n}" class="done_button" onclick="finishSimpleField({$oField->getId()})" />
-			 {/if}
          </div>
    </td>
-{/foreach}		 
+{/foreach}
 </tr>
 </tfoot>
 </table>