Merge pull request #1134 from bendiy/no-rest-for-you

SYS ORMs cannot be set to isRest: true.

diff --git a/enyo-client/database/orm/models/customer.json b/enyo-client/database/orm/models/customer.json
index dafa899..2c5bef8 100644 (file)
--- a/enyo-client/database/orm/models/customer.json
+++ b/enyo-client/database/orm/models/customer.json
@@ -1995,7 +1995,6 @@
     "nameSpace": "SYS",
     "type": "CustomerRelation",
     "table": "custinfo",
-    "isRest": true,
     "comment": "Customer Relation Map",
     "privileges": {
       "all": {

diff --git a/enyo-client/database/orm/models/sales_order.json b/enyo-client/database/orm/models/sales_order.json
index b5ed735..3efa3b6 100644 (file)
--- a/enyo-client/database/orm/models/sales_order.json
+++ b/enyo-client/database/orm/models/sales_order.json
@@ -1959,7 +1959,6 @@
     "nameSpace": "SYS",
     "type": "SalesOrderRelation",
     "table": "xt.coheadinfo",
-    "isRest": true,
     "comment": "Sales Order Relation Map",
     "privileges": {
       "all": {

diff --git a/lib/orm/source/xt/javascript/orm.sql b/lib/orm/source/xt/javascript/orm.sql
index f422a85..93cf072 100644 (file)
--- a/lib/orm/source/xt/javascript/orm.sql
+++ b/lib/orm/source/xt/javascript/orm.sql
@@ -69,6 +69,7 @@ select xt.install_js('XT','Orm','xtuple', $$
     if(!nameSpace) throw new Error("A name space is required");
     if(!type) throw new Error("A type is required");
     if(!context) throw new Error("A context is required");
+    if(isRest && nameSpace === 'SYS') throw new Error("SYS ORMs cannot be isRest: true.");
 
     sql = 'select orm_id as "id", ' +
           '  orm_json as "json", ' +