compile validated

diff --git a/enyo-client/extensions/source/billing/client/models/cash_receipt.js b/enyo-client/extensions/source/billing/client/models/cash_receipt.js
index 376c06b..5cd2d57 100644 (file)
--- a/enyo-client/extensions/source/billing/client/models/cash_receipt.js
+++ b/enyo-client/extensions/source/billing/client/models/cash_receipt.js
@@ -23,7 +23,6 @@ XT.extensions.billing.initCashReceipt = function () {
         currency: XM.baseCurrency,
         currencyRate: 1,
         applicationDate: new Date(),
-        lineItems: new XM.CashReceiptLineCollection(),
         appliedAmount: 0,
         balance: 0
       };
@@ -363,8 +362,6 @@ XT.extensions.billing.initCashReceipt = function () {
    */
   XM.CashReceiptLine = XM.Info.extend({
     recordType: 'XM.CashReceiptLine',
-    editableModel: 'XM.CashReceiptReceivable',
-    idAttribute: 'uuid',
 
     defaults: {
       amount: 0,
@@ -451,14 +448,6 @@ XT.extensions.billing.initCashReceipt = function () {
     model: XM.CashReceipt
   });
 
-  /**
-   * @class XM.CashReceiptLineCollection
-   * @extends XM.Collection
-   */
-  XM.CashReceiptLineCollection = XM.Collection.extend({
-    model: XM.CashReceiptLine
-  });
-
   /**
    * @class XM.CashReceiptListItemCollection
    * @extends XM.Collection

diff --git a/enyo-client/extensions/source/billing/database/orm/models/cash_receipt.json b/enyo-client/extensions/source/billing/database/orm/models/cash_receipt.json
index ba8e043..498df0a 100644 (file)
--- a/enyo-client/extensions/source/billing/database/orm/models/cash_receipt.json
+++ b/enyo-client/extensions/source/billing/database/orm/models/cash_receipt.json
@@ -117,7 +117,7 @@
         "toOne": {
           "type": "BankAccountRelation",
           "column": "bankaccnt_id",
-          "isNested": true
+          "required": true
         }
       },
       {
@@ -188,7 +188,7 @@
         }
       },
       {
-        "name": "owner",
+        "name": "cashReceipt",
         "attr": {
           "type": "Number",
           "column": "cashrcptitem_cashrcpt_id"
@@ -198,7 +198,7 @@
         "name": "receivable",
         "toOne": {
           "isNested": true,
-          "type": "ReceivableRelation",
+          "type": "CashReceiptReceivable",
           "column": "cashrcptitem_aropen_id"
         }
       },
@@ -236,7 +236,6 @@
     "idSequenceName": "cashrcptitem_cashrcptitem_id_seq",
     "isRest": true,
     "lockable": true,
-    "isNestedOnly": true,
     "isSystem": true,
     "comment": "Pending Cash Receipt Line Item",
     "privileges": {
@@ -320,7 +319,6 @@
     "isRest": true,
     "lockable": true,
     "comment": "Cash Receipt Relation",
-    "isNestedOnly": true,
     "isSystem": true,
     "privileges": {
       "all": {
@@ -594,9 +592,9 @@
       {
         "name": "bankAccount",
         "toOne": {
+          "isNested": true,
           "type": "BankAccountRelation",
-          "column": "bankaccnt_id",
-          "isNested": true
+          "column": "bankaccnt_id"
         }
       },
       {

diff --git a/enyo-client/extensions/source/billing/database/orm/models/receivable.json b/enyo-client/extensions/source/billing/database/orm/models/receivable.json
index 1d7452a..49eb845 100644 (file)
--- a/enyo-client/extensions/source/billing/database/orm/models/receivable.json
+++ b/enyo-client/extensions/source/billing/database/orm/models/receivable.json
@@ -468,7 +468,6 @@
     "table": "xt.aropeninfo",
     "idSequenceName": "aropen_aropen_id_seq",
     "isRest": true,
-    "isNestedOnly": true,
     "isSystem": true,
     "comment": "Receivable Map",
     "privileges": {

diff --git a/lib/backbone-x/source/model.js b/lib/backbone-x/source/model.js
index 73e200c..61d168a 100644 (file)
--- a/lib/backbone-x/source/model.js
+++ b/lib/backbone-x/source/model.js
@@ -1,11 +1,24 @@
-/*jshint unused:false */
-/* global XG:true */
+// Contributions of status related functionality borrowed from SproutCore:
+// https://github.com/sproutcore/sproutcore
+
+/*jshint indent:2, curly:true, eqeqeq:true, immed:true, latedef:true,
+newcap:true, noarg:true, regexp:true, undef:true, strict:true, trailing:true,
+white:true, expr:true*/
+/*global XT:true, XM:true, Backbone:true, _:true, setInterval:true,
+  clearInterval:true, jsonpatch:true, Globalize:true, XG:true*/
 
 (function () {
-  'use strict';
+  "use strict";
 
   XM.Tuplespace = _.clone(Backbone.Events);
 
+
+  /*
+  XG.Tuplespace.on('all', function () {
+    //console.log(arguments);
+  });
+  */
+
   /**
     @class `XM.Model` is an abstract class designed to operate with `XT.DataSource`.
     It should be subclassed for any specific implementation. Subclasses should
@@ -82,13 +95,12 @@
         callback();
       }
     },
-
+      
     /**
       A function that binds events to functions. It can and should only be called
       once by initialize. Any attempt to call it a second time will throw an error.
     */
     bindEvents: function () {
-      var that = this;
       // Bind events, but only if we haven't already been here before.
       // We could silently skip, but then that means any overload done
       // by anyone else has to do that check too. That's too error prone
@@ -96,17 +108,6 @@
       // are not immediatley apparent and insidiously hard to pin down.
       if (this._eventsBound) { throw "Events have already been bound."; }
 
-      /**
-       * Bind all events in the optional 'handlers' hash
-       */
-      _.each(this.handlers, function (handler, event) {
-        if (!_.isFunction(that[handler])) {
-          console.warn('Handler '+ handler + 'not found: not binding');
-          return;
-        }
-        that.on(event, that[handler]);
-      });
-
       this.on('change', this.didChange);
       this.on('error', this.didError);
       this.on('destroy', this.didDestroy);
@@ -114,11 +115,11 @@
       _.each(
         _.where(this.relations, { type: Backbone.HasMany, includeInJSON: true }),
         function (relation) {
-          that.on('add:' + relation.key, that.didChange);
-          if (!that.isReadOnly()) {
-            that.on('add:' + relation.key, that.relationAdded);
+          this.on('add:' + relation.key, this.didChange);
+          if (!this.isReadOnly()) {
+            this.on('add:' + relation.key, this.relationAdded);
           }
-        });
+        }, this);
 
       this._idx = {};
       this._eventsBound = true;
@@ -560,8 +561,7 @@
     initialize: function (attributes, options) {
       attributes = attributes || {};
       options = options || {};
-      var that = this,
-        klass,
+      var klass,
         K = XM.Model,
         status = this.getStatus(),
         idAttribute = this.idAttribute;
@@ -608,9 +608,9 @@
       }
 
       /**
-       * Enable ability to listen for events in a global tuple-space, if
-       * required.
-       */
+      * Enable ability to listen for events in a global tuple-space, if
+      * required.
+      */
       XM.Tuplespace.listenTo(this, 'all', XM.Tuplespace.trigger);
     },
 
@@ -870,8 +870,6 @@
         parentRelation = _.find(this.relations, function (relation) {
           return relation.isAutoRelation;
         });
-        // #refactor XXX if this is a bona fide Backbone Relational relation,
-        // events will propagate automatically from child to parent.
         parent.changed[parentRelation.reverseRelation.key] = true;
         parent.trigger('change', parent, options);
       }
@@ -1152,4 +1150,4 @@
     if (options && options.isFetching) { this.status = XM.Model.BUSY_FETCHING; }
   };
 
-})();
+}());