owl-cli 5.37.0 → 5.40.0

package/defaultTemplate/api/src/handlers/include/checklogin.jsx

@@ -1,6 +1,12 @@
 //#import session.js
 //#import $owl_backend_session:services/modelService.jsx
 //#import $owlPermission:services/permissionService.jsx
+//#import $owl_orgs:services/modelService.jsx
+function getParentOrgIds(orgId){
+    var org = owl_orgsService.get(orgId);
+    return org.parentPathIds;
+
+}
 
 function checklogin(){
     var magic = $.getSystemProperty("magic");
@@ -26,7 +32,7 @@ function checklogin(){
             var loginUserId = session.userId
             var roleId = session.role;
             var orgId = session.orgId;
-            var orgIds = session.orgIds;
+            var orgIds = getParentOrgIds(orgId);
             if(loginUserId){
                 var env = {
                     now: new Date().getTime(),

package/defaultTemplate/api/src/handlers/list.jsx

@@ -15,7 +15,7 @@ var spec = @spec;
 
 function buildSort(sort){
   if(!sort){
-    return null;
+    return {};
   }
   var result = [];
   for(var k in sort){
@@ -208,7 +208,10 @@ function buildSort(sort){
 
   var objs = hits.map(function(hit){return hit._source});
 
-
+  delete query.from;
+  delete query.size;
+  delete query.sort;
+  sndTxt = JSON.stringify(query);
   var countUrl = elasticSearchUrl+"/@projectCode/_count";
 
   var ss = HttpUtils.postRaw( countUrl, sndTxt, headers);

package/defaultTemplate/api/src/handlers/save.jsx

@@ -43,8 +43,15 @@
 
     if (!id || action=='add') {
       //adding
-      modelObject._orgId = orgId;
-      modelObject._orgIds = orgIds;
+      if(!modelObject._orgId){
+        modelObject._orgId = orgId;
+        modelObject._orgIds = orgIds;
+      }
+      else{
+        modelObject._orgIds = getParentOrgIds(orgId);
+      }
+
+
       modelObject.m = env.m;
       var newdata = @projectCodeService.add( modelObject,env );
     }

package/defaultTemplate/api/src/services/modelService.jsx

@@ -877,7 +877,7 @@ var @projectCodeService = (function (pigeon) {
             var filters = [];
             var must_not = [{
                 term:{
-                    del:'T'
+                    "del.keyword":'T'
                 }
             }];
             for(var k in searchArgs){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "owl-cli",
-  "version": "5.37.0",
+  "version": "5.40.0",
   "main": "index.js",
   "preferGlobal": true,
   "bin": {