Ignore:
Timestamp:
03/09/14 19:25:40 (11 years ago)
Author:
hendrikvanantwerpen
Message:
  • _ComplexValueMixin propagates priorityChange to children.
  • Deserialize updated docs after save too.
  • Validate to false if definitions are missing.
Location:
Dev/trunk/src/client/qed-client/model
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • Dev/trunk/src/client/qed-client/model/classes/_Class.js

    r492 r493  
    3434        save: function(obj) {
    3535            return this._store.put(this._doSerialize(obj))
    36             .otherwise(lang.hitch(this,'_deserializeError'));
     36            .then(lang.hitch(this,'_doDeserialize'),
     37                  lang.hitch(this,'_deserializeError'));
    3738        },
    3839        remove: function(objOrId,rev) {

  • Dev/trunk/src/client/qed-client/model/widgets/QuestionEditorToolkit.js

    r487 r493  
    3030            { type: "Header" },
    3131            { type: "Text" },
    32             { type: "Image" },
    33             { type: "ExternalMedia" },
    3432            { type: "Divider" }
    3533        ],
    … …  
    4442            "Header": "Header",
    4543            "Text": "Text",
    46             "Image": "Image",
    47             "ExternalMedia": "External media",
    4844            "Divider": "Divider",
    4945            "StringInput": "Text line",
    … …  
    5652            "Header": "Header",
    5753            "Text": "TextBox",
    58             "Image": "Image",
    59             "ExternalMedia": "External",
    6054            "Divider": "Divider",
    6155            "StringInput": "Text",

  • Dev/trunk/src/client/qed-client/model/widgets/SurveyRunWidget.js

    r492 r493  
    1717            if ( !value.startDate ) { delete value.startDate; }
    1818            if ( !value.endDate ) { delete value.endDate; }
    19             value.respondentCanDeleteOwnResponse = value.respondentCanDeleteOwnResponse[0] === true;
     19            value.respondentCanDeleteOwnResponse =
     20                value.respondentCanDeleteOwnResponse.length > 0;
    2021            return value;
     22        },
     23        _setValueAttr: function(value) {
     24            value.respondentCanDeleteOwnResponse =
     25                value.respondentCanDeleteOwnResponse ? ["on"] : [];
     26            this.inherited(arguments);
    2127        }
    2228    });

  • Dev/trunk/src/client/qed-client/model/widgets/SurveySummary.js

    r490 r493  
    1919            this.titleNode.innerHTML = survey.title || "";
    2020            domAttr.set(this.titleNode, "href", survey && surveys.getObjectPath(survey));
    21             this.descriptionNode.innerHTML = survey.description;
     21            this.descriptionNode.innerHTML = survey.description || "";
    2222            this.questionsNode.innerHTML = survey.questions.length;
    2323        }

  • Dev/trunk/src/client/qed-client/model/widgets/questions/MultipleChoiceInputConfigWidget.js

    r490 r493  
    5252        _getValueAttr: function() {
    5353            var value = this.inherited(arguments);
    54             value.allowMultiple = value.allowMultiple && value.allowMultiple.length > 0;
     54            value.allowMultiple = value.allowMultiple.length > 0;
    5555            value.type = this.type;
    5656            return value;
    57         },
    58         _setValueAttr: function(value) {
    59             value.allowMultiple = value.allowMultiple === true ? ["on"] : [];
    60             this.inherited(arguments);
    6157        },
    6258        onAddItem: function(evt) {

  • Dev/trunk/src/client/qed-client/model/widgets/questions/NumberInputConfigWidget.js

    r443 r493  
    1010            var value = this.inherited(arguments);
    1111            value.type = this.type;
     12            if ( !value.min ) { delete value.min; }
     13            if ( !value.max ) { delete value.max; }
     14            if ( !value.places ) { delete value.places; }
    1215            return value;
    1316        }

  • Dev/trunk/src/client/qed-client/model/widgets/questions/TextInputConfigWidget.js

    r443 r493  
    1010            var value = this.inherited(arguments);
    1111            value.type = this.type;
     12            if ( !value.maxLength ) { delete value.maxLength; }
    1213            return value;
    1314        }

  • Dev/trunk/src/client/qed-client/model/widgets/questions/templates/MultipleChoiceInputConfigRowWidget.html

    r461 r493  
    11<form>
    2   <div data-dojo-type="dijit/form/ValidationTextBox" name="text" required="required" data-dojo-attach-point="textBox"></div><div data-dojo-type="dijit/form/Button" data-dojo-attach-event="onClick:onDestroy">X</div>
     2  <div data-dojo-type="dijit/form/ValidationTextBox"
     3       name="text" required="required"
     4       data-dojo-attach-point="textBox"></div>
     5  <div data-dojo-type="dijit/form/Button"
     6       data-dojo-attach-event="onClick:onDestroy">X</div>
    37</form>

  • Dev/trunk/src/client/qed-client/model/widgets/questions/templates/MultipleChoiceInputConfigWidget.html

    r461 r493  
    66  <div data-dojo-attach-point="itemsNode">
    77  </div>
    8   <div data-dojo-type="dijit/form/Button" data-dojo-attach-event="onClick:onAddItem">Add item</div>
     8  <div data-dojo-type="dijit/form/Button"
     9       data-dojo-attach-event="onClick:onAddItem">Add item</div>
    910</form>

  • Dev/trunk/src/client/qed-client/model/widgets/templates/SurveyRunWidget.html

    r492 r493  
    2525        <input type="text" name="respondentCanDeleteOwnResponse"
    2626               class="qedField"
    27                data-dojo-type="dijit/form/CheckBox"
    28                data-dojo-props="'value':true" />
     27               data-dojo-type="dijit/form/CheckBox" />
    2928    </div>
    3029
Note: See TracChangeset for help on using the changeset viewer.