owl-cli 5.40.0 → 5.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.
|
@@ -3,8 +3,15 @@
|
|
|
3
3
|
//#import $owlPermission:services/permissionService.jsx
|
|
4
4
|
//#import $owl_orgs:services/modelService.jsx
|
|
5
5
|
function getParentOrgIds(orgId){
|
|
6
|
+
if(orgId=='0'){
|
|
7
|
+
return ['0'];
|
|
8
|
+
}
|
|
9
|
+
|
|
6
10
|
var org = owl_orgsService.get(orgId);
|
|
7
|
-
|
|
11
|
+
if(org){
|
|
12
|
+
return org.parentPathIds;
|
|
13
|
+
}
|
|
14
|
+
return [orgId];
|
|
8
15
|
|
|
9
16
|
}
|
|
10
17
|
|
|
@@ -32,7 +39,7 @@ function checklogin(){
|
|
|
32
39
|
var loginUserId = session.userId
|
|
33
40
|
var roleId = session.role;
|
|
34
41
|
var orgId = session.orgId;
|
|
35
|
-
var orgIds = getParentOrgIds(orgId);
|
|
42
|
+
var orgIds = [orgId].concat(getParentOrgIds(orgId));
|
|
36
43
|
if(loginUserId){
|
|
37
44
|
var env = {
|
|
38
45
|
now: new Date().getTime(),
|
|
@@ -45,17 +45,13 @@
|
|
|
45
45
|
//adding
|
|
46
46
|
if(!modelObject._orgId){
|
|
47
47
|
modelObject._orgId = orgId;
|
|
48
|
-
modelObject._orgIds = orgIds;
|
|
49
48
|
}
|
|
50
|
-
|
|
51
|
-
modelObject._orgIds = getParentOrgIds(orgId);
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
|
|
49
|
+
modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
|
|
55
50
|
modelObject.m = env.m;
|
|
56
51
|
var newdata = @projectCodeService.add( modelObject,env );
|
|
57
52
|
}
|
|
58
53
|
else {
|
|
54
|
+
modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
|
|
59
55
|
var newdata = @projectCodeService.update( modelObject,env);
|
|
60
56
|
}
|
|
61
57
|
|