@steedos/standard-permission 2.4.0-beta.25 → 2.4.0-beta.26

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.
Files changed (6) hide show
  1. package/main/default/objects/permission_objects.action.js +8 -5
  2. package/main/default/objects/permission_set/buttons/permission_set.action.js +2 -1
  3. package/main/default/objects/permission_tabs/buttons/customize.button.js +2 -1
  4. package/main/default/objects/restriction_rules.action.js +2 -1
  5. package/main/default/objects/share_rules.action.js +2 -1
  6. package/package.json +2 -2
package/main/default/objects/permission_objects.action.js CHANGED
@@ -11,13 +11,13 @@ module.exports = {
11
11
  delete newDoc.is_system;
12
12
 
13
13
  let permissionSetId = doc.permission_set_id
14
- if(_.include(['admin','user','supplier','customer'], doc.permission_set_id)){
14
+ if(_.includes(['admin','user','supplier','customer'], doc.permission_set_id)){
15
15
  let dbPst = Creator.odata.query('permission_set', {$select: "_id", $filter: "(name eq '"+doc.permission_set_id+"') and (space eq '"+Steedos.getSpaceId()+"')"}, true)
16
16
  if(dbPst && dbPst.length > 0){
17
17
  permissionSetId = dbPst[0]._id;
18
18
  }
19
19
 
20
- if(_.include(['admin','user','supplier','customer'], permissionSetId)){
20
+ if(_.includes(['admin','user','supplier','customer'], permissionSetId)){
21
21
  return toastr.error("请先自定义权限集")
22
22
  }
23
23
  }
@@ -32,7 +32,8 @@ module.exports = {
32
32
  }
33
33
  });
34
34
  },
35
- customizeVisible: function(object_name, record_id, record_permissions, record){
35
+ customizeVisible: function(object_name, record_id, record_permissions, data){
36
+ var record = data && data.record;
36
37
  if(!record){
37
38
  record = {}
38
39
  }
@@ -48,10 +49,12 @@ module.exports = {
48
49
  FlowRouter.reload();
49
50
  }
50
51
  },
51
- resetFieldPermissionsVisible: function (object_name, record_id, record_permissions, record) {
52
+ resetFieldPermissionsVisible: function (object_name, record_id, record_permissions, data) {
53
+ var record = data && data.record;
52
54
  if (!record) {
53
55
  record = {}
54
56
  }
55
- return !(Creator.baseObject.actions.standard_new.visible() && record.is_system);
57
+ return Creator.baseObject.actions.standard_new.visible() && !record.is_system;
58
+ // return !(Creator.baseObject.actions.standard_new.visible() && record.is_system);
56
59
  }
57
60
  }
package/main/default/objects/permission_set/buttons/permission_set.action.js CHANGED
@@ -8,7 +8,8 @@ module.exports = {
8
8
  });
9
9
 
10
10
  },
11
- customizeVisible: function(object_name, record_id, record_permissions, record){
11
+ customizeVisible: function(object_name, record_id, record_permissions, data){
12
+ var record = data && data.record;
12
13
  if(!record){
13
14
  record = {}
14
15
  }
package/main/default/objects/permission_tabs/buttons/customize.button.js CHANGED
@@ -24,7 +24,8 @@ module.exports = {
24
24
  }
25
25
  });
26
26
  },
27
- customizeVisible: function (object_name, record_id, record_permissions, record) {
27
+ customizeVisible: function (object_name, record_id, record_permissions, data) {
28
+ var record = data && data.record;
28
29
  return record && Creator.baseObject.actions.standard_new.visible() && record.is_system;
29
30
  }
30
31
  }
package/main/default/objects/restriction_rules.action.js CHANGED
@@ -16,7 +16,8 @@ module.exports = {
16
16
  }
17
17
  });
18
18
  },
19
- customizeVisible: function (object_name, record_id, record_permissions, record) {
19
+ customizeVisible: function (object_name, record_id, record_permissions, data) {
20
+ var record = data && data.record;
20
21
  if (!record) {
21
22
  record = {}
22
23
  }
package/main/default/objects/share_rules.action.js CHANGED
@@ -16,7 +16,8 @@ module.exports = {
16
16
  }
17
17
  });
18
18
  },
19
- customizeVisible: function (object_name, record_id, record_permissions, record) {
19
+ customizeVisible: function (object_name, record_id, record_permissions, data) {
20
+ var record = data && data.record;
20
21
  if (!record) {
21
22
  record = {}
22
23
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/standard-permission",
3
- "version": "2.4.0-beta.25",
3
+ "version": "2.4.0-beta.26",
4
4
  "main": "package.service.js",
5
5
  "private": false,
6
6
  "publishConfig": {
@@ -12,5 +12,5 @@
12
12
  "description": "steedos package",
13
13
  "repository": {},
14
14
  "license": "MIT",
15
- "gitHead": "1a46fbee4dd51269a59dc80ff30fde5572679c3a"
15
+ "gitHead": "bdcc1c0dade33d528ae0d5c0552e2b66b5a1e783"
16
16
  }