owl-cli 7.41.0 → 7.43.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -130,7 +130,7 @@ function buildSort(sort){
|
|
|
130
130
|
}
|
|
131
131
|
|
|
132
132
|
var sr = @projectCodeService.search(mfilters, searchArgs, keyword,from, pageSize, effectiveSort, dataSource ,isRecycleBin );
|
|
133
|
-
var count = @projectCodeService.count(mfilters, searchArgs, keyword ,isRecycleBin);
|
|
133
|
+
var count = @projectCodeService.count(mfilters, searchArgs, keyword ,dataSource,isRecycleBin);
|
|
134
134
|
|
|
135
135
|
|
|
136
136
|
if(sr.state=='ok'){
|
|
@@ -88,12 +88,8 @@
|
|
|
88
88
|
if(modelObject._v === -1){
|
|
89
89
|
modelObject._v = oldObj._v;
|
|
90
90
|
}
|
|
91
|
-
|
|
92
91
|
var merged = merge(oldObj,modelObject,permissions,orgId);
|
|
93
|
-
|
|
94
92
|
merged.owl_lastModifiedUserId = env.loginUserId;
|
|
95
|
-
merged._orgId = orgId;
|
|
96
|
-
|
|
97
93
|
var newdata = @projectCodeService.update( merged,env);
|
|
98
94
|
}
|
|
99
95
|
|
|
@@ -1285,9 +1285,7 @@ var @projectCodeService = (function (pigeon) {
|
|
|
1285
1285
|
|
|
1286
1286
|
search: function(mfilters, searchArgs, keyword,from, pageSize, sort, dataSource,isRecycleBin,meta_fields){
|
|
1287
1287
|
var query = f.buildQuery(mfilters,searchArgs,keyword,isRecycleBin,meta_fields);
|
|
1288
|
-
|
|
1289
|
-
var effectiveSort = [];
|
|
1290
|
-
var effectiveSort = [{owl_createTime:{order:"desc"}}];
|
|
1288
|
+
var effectiveSort = [{owl_createTime:{order:"desc"}}];
|
|
1291
1289
|
if(sort){
|
|
1292
1290
|
effectiveSort = sort;
|
|
1293
1291
|
}
|