@steedos/standard-permission 2.5.3-beta.9 → 2.5.5-beta.1

package/main/default/objectTranslations/permission_set.en/permission_set.en.objectTranslation.yml

@@ -108,9 +108,9 @@ listviews:
   all:
     label: All
   permission_set:
-    label: Permission Set
+    label: Permission Sets
   profile:
-    label: Profile
+    label: Profiles
 actions:
   customize:
     label: Customize

package/main/default/objects/permission_set/buttons/permission_set.action.js

@@ -1,7 +1,9 @@
 module.exports = {
     customize: function (object_name, record_id, fields) {
         var doc = Creator.odata.get(object_name, record_id)
-        Creator.odata.insert(object_name, {name: doc.name, label: doc.label, type: doc.type, license: doc.license, lockout_interval: doc.lockout_interval, max_login_attempts: doc.max_login_attempts, password_history: doc.password_history}, function(result, error){
+        Creator.odata.insert(object_name, {name: doc.name, label: doc.label, type: doc.type, license: doc.license, lockout_interval: doc.lockout_interval, max_login_attempts: doc.max_login_attempts, password_history: doc.password_history, 
+            default_standard_buttons: doc.default_standard_buttons
+        }, function(result, error){
             if(result){
                 FlowRouter.go(`/app/-/${object_name}/view/${result._id}`)
             }

package/main/default/objects/permission_set/permission_set.object.yml

@@ -24,7 +24,7 @@ fields:
     label: Type
     type: select
     firstOption: false
-    options: Profile:profile,Permission set:permission_set
+    options: Permission set:permission_set
     defaultValue: permission_set
   assigned_apps:
     label: Assigned Apps

package/main/default/objects/permission_tabs/permissions/customer.permission.yml

@@ -9,6 +9,6 @@ allowRead: true
 allowReadFiles: true
 modifyAllRecords: false
 permission_set_id: customer
-viewAllFiles: false
-viewAllRecords: false
-viewCompanyRecords: false
+viewAllFiles: true
+viewAllRecords: true
+viewCompanyRecords: true

package/main/default/routes/copyProfile.router.js

@@ -2,7 +2,7 @@
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-05-26 16:56:54
  * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2023-05-13 17:00:38
+ * @LastEditTime: 2023-06-18 12:55:43
  * @Description: 复制已有简档来创建新简档
  * 使用mongodb的事务处理，保证数据的一致性
  * 复制对象包括：简档、对象权限、字段权限、选项卡权限
@@ -53,7 +53,7 @@ router.post('/api/permission/permission_set/copy', core.requireAuthentication, a
             throw new Error("permission_set is not profile type");
         }
 
-        const { name:originalPermissionSetName } = originalPermissionSet;
+        const { name: originalPermissionSetName } = originalPermissionSet;
 
         // API名称不能重复
         const existPermissionSetCount = await psObj.count({
@@ -83,7 +83,7 @@ router.post('/api/permission/permission_set/copy', core.requireAuthentication, a
         const permissionSetColl = db.collection('permission_set');
 
         // Start a transaction
-        session.startTransaction({ readConcern: { level: "local" }, writeConcern: { w: "majority" } });
+        session.startTransaction({ readConcern: { level: "majority" }, writeConcern: { w: "majority" }, readPreference: 'primary' });
 
         let newPermissionSet = null;
 
@@ -113,7 +113,7 @@ router.post('/api/permission/permission_set/copy', core.requireAuthentication, a
             };
 
             delete newPermissionSetData.record_permissions;
-            const insertPermissionSetResult = await permissionSetColl.insertOne(newPermissionSetData);
+            const insertPermissionSetResult = await permissionSetColl.insertOne(newPermissionSetData, { session });
             newPermissionSet = insertPermissionSetResult.ops[0];
             // console.log('newPermissionSet', newPermissionSet)
 
@@ -228,7 +228,7 @@ async function getInternalPermissionObjects(permissionSetId) {
         filters: [
             ['_id', '=', permissionSetId],
         ]
-    })[0]);
+    }))[0];
     // 如果库中有记录则使用库中的name作为判断条件，否则使用permissionSetId
     const permissionSetName = permissionSetDoc ? permissionSetDoc.name : permissionSetId;
 

package/main/default/triggers/permission_objects.trigger.js

@@ -105,7 +105,7 @@ module.exports = {
                         filters: [
                             ['_id', '=', permissionSetId],
                         ]
-                    })[0]);
+                    }))[0];
                     if (permissionSetDoc) {
                         // 替换this.query.filters中全部的的permission_set_id为permissionSetDoc.name
                         this.query.filters = this.query.filters.replace(regex, permissionSetDoc.name).replace(`permission_set_id eq '${permissionSetDoc.name}'`, `(permission_set_id eq '${permissionSetDoc.name}') or (permission_set_id eq '${permissionSetId}')`);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-permission",
-    "version": "2.5.3-beta.9",
+    "version": "2.5.5-beta.1",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,5 +12,5 @@
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "94bb5ef26fa3d0504e3131d2f9d990d4545430a3"
+    "gitHead": "2d9b97fbe49148c4440eaf3d127e3344f10caede"
 }