From 624698e12fd374d3ddc6403b38879b49de81c772 Mon Sep 17 00:00:00 2001 From: Martin Schoeler Date: Mon, 12 Jun 2017 16:37:05 -0300 Subject: [PATCH 1/6] work in progress --- .../client/views/permissions.html | 2 +- .../client/views/permissions.js | 5 + .../server/startup.js | 4 +- packages/rocketchat-i18n/i18n/en.i18n.json | 241 ++++++++++++++++++ 4 files changed, 250 insertions(+), 2 deletions(-) diff --git a/packages/rocketchat-authorization/client/views/permissions.html b/packages/rocketchat-authorization/client/views/permissions.html index 3d53eb803e42..9199a2ae0c03 100644 --- a/packages/rocketchat-authorization/client/views/permissions.html +++ b/packages/rocketchat-authorization/client/views/permissions.html @@ -19,7 +19,7 @@ {{#each permission}} - {{_id}} + {{_ permissionName}} {{#each role}} diff --git a/packages/rocketchat-authorization/client/views/permissions.js b/packages/rocketchat-authorization/client/views/permissions.js index 90f115104148..dd17fb044028 100644 --- a/packages/rocketchat-authorization/client/views/permissions.js +++ b/packages/rocketchat-authorization/client/views/permissions.js @@ -6,6 +6,7 @@ Template.permissions.helpers({ }, permission() { + console.log(ChatPermissions.find({}, {}).fetch()); return ChatPermissions.find({}, { sort: { _id: 1 @@ -21,6 +22,10 @@ Template.permissions.helpers({ } }, + permissionName() { + return `permission_${ this._id }`; + }, + hasPermission() { return RocketChat.authz.hasAllPermission('access-permissions'); } diff --git a/packages/rocketchat-authorization/server/startup.js b/packages/rocketchat-authorization/server/startup.js index 3fe7771125de..7378c47c1066 100644 --- a/packages/rocketchat-authorization/server/startup.js +++ b/packages/rocketchat-authorization/server/startup.js @@ -64,9 +64,11 @@ Meteor.startup(function() { { _id: 'preview-c-room', roles : ['admin', 'user', 'anonymous'] } ]; + permissions.forEach(o => { o.i18nLabel = `permission_${ o._id }_description` ; }); + for (const permission of permissions) { if (!RocketChat.models.Permissions.findOneById(permission._id)) { - RocketChat.models.Permissions.upsert(permission._id, {$set: permission }); + RocketChat.models.Permissions.upsert(permission._id, {i18nLabel: permission.i18nLabel}, {$set: permission }); } } diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index 1b2888536b9a..24f6ab2e4e38 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -1155,6 +1155,247 @@ "People": "People", "Permalink": "Permalink", "Permissions": "Permissions", + //empty lines are for ease of reviewing this pr. They will be removed before merging + + "permission_access-mailer":"Access Mailer Screen", + "permission_access-mailer_description":"Permission to send mass email to all users.", + + "permission_access-permissions":"Access Permissions Screen", + "permission_access-permissions_description":"Modify permissions for various roles.", + + "permission_add-oauth-service":"Add Oauth Service", + "permission_add-oauth-service_description":"Permission to add a new Oauth service", + + "permission_add-user":"Add User", + "permission_add-user_description":"Permission to add new users to the server via users screen", + + "permission_add-user-to-any-c-room":"Add User to Any Public Channel", + "permission_add-user-to-any-c-room_description":"Permission to add a user to any public channel", + + "permission_add-user-to-any-p-room":"Add User to Any Private Channel", + "permission_add-user-to-any-p-room_description":"Permission to add a user to any private channel", + + "permission_add-user-to-joined-room":"Add User to Any Joined Channel", + "permission_add-user-to-joined-room_description":"Permission to add a user to a currently joined channel", + + "permission_archive-room":"Archive Room", + "permission_archive-room_description":"Permission to archive a channel", + + "permission_assign-admin-role":"Assign Admin Role", + "permission_assign-admin-role_description":"Permission to assign the admin role to other users", + + "permission_auto-translate":"Auto Translate", + "permission_auto-translate_description":"Permission to use the auto translate tool", + + "permission_ban-user":"Ban User", + "permission_ban-user_description":"Permission to assign the admin role to other users", + + "permission_bulk-create-c":"Bulk Create Channels", + "permission_bulk-create-c_description":"Permission to create channels in bulk", + + "permission_bulk-register-user":"Bulk Create Channels", + "permission_bulk-register-user_description":"Permission to create channels in bulk", + + "permission_clean-channel-history":"Clean Channel History", + "permission_clean-channel-history_description":"Permission to Clear the history from channels", + + "permission_close-livechat-room":"Close Livechat Room", + "permission_close-livechat-room_description":"Permission to close the current LiveChat channel", + + "permission_close-others-livechat-room":"Close Livechat Room", + "permission_close-others-livechat-room_description":"Permission to close other LiveChat channels", + + "permission_create-c":"Create Public Channels", + "permission_create-c_description":"Permission to create public channels", + + "permission_create-d":"Create Direct Messages", + "permission_create-d_description":"Permission to start direct messages", + + "permission_create-p":"Create Private Channels", + "permission_create-p_description":"Permission to create private channels", + + "permission_create-user":"Create User", + "permission_create-user_description":"Permission to create users", + + "permission_delete-c":"Delete Public Channels", + "permission_delete-c_description":"Permission to delete public channels", + + "permission_delete-d":"Delete Direct Messages", + "permission_delete-d_description":"Permission to delete direct messages", + + "permission_delete-p":"Delete Private Channels", + "permission_delete-p_description":"Permission to delete private channels", + + "permission_delete-message":"Delete Message", + "permission_delete-message_description":"Permission to delete a message within a room", + + "permission_delete-user":"Delete User", + "permission_delete-user_description":"Permission to delete users", + + "permission_edit-message":"Edit Message", + "permission_edit-message_description":"Permission to edit a message within a room", + + "permission_edit-other-user-active-status":"Edit Other User Active Status", + "permission_edit-other-user-active-status_description":"Permission to enable or disable other accounts", + + "permission_edit-other-user-info":"Edit Other User Information", + "permission_edit-other-user-info_description":"Permission to change other user’s name, username or email address.", + + "permission_edit-other-user-password":"Edit Other User Password", + "permission_edit-other-user-password_description":"Permission to modify other user’s passwords. Requires edit-other-user-info permission.", + + "permission_edit-privileged-setting":"Edit privileged Setting", + "permission_edit-privileged-setting_description":"Permission to edit settings", + + "permission_edit-room":"Edit Room", + "permission_edit-room_description":"Permission to edit a room’s name, topic, type (private or public status) and status (active or archived)", + + "permission_force-delete-message":"Force Delete Message", + "permission_force-delete-message_description":"Permission to delete a message bypassing all restrictions", + + "permission_join-without-join-code":"Join Without Join Code", + "permission_join-without-join-code_description":"Permission to bypass the join code in channels with join code enabled", + + "permission_mail-messages":"Mail Messages", + "permission_mail-messages_description":"Permission to use the mail messages option", + + "permission_manage-assets":"Manage Assets", + "permission_manage-assets_description":"Permission to manage the server assets", + + "permission_manage-emoji":"Manage Emoji", + "permission_manage-emoji_description":"Permission to manage the server emojis", + + "permission_manage-integrations":"Manage Integrations", + "permission_manage-integrations_description":"Permission to manage the server integrations", + + "permission_manage-oauth-apps":"Manage Oauth Apps", + "permission_manage-oauth-apps_description":"Permission to manage the server Oauth apps", + + "permission_manage-own-integrations":"Manage Own Integrations", + "permission_manage-own-integrations_description":"Permition to users create and edit their own integration or webhooks", + + "permission_manage-sounds":"Manage Sounds", + "permission_manage-sounds_description":"Permission to manage the server sounds", + + "permission_mention-all":"Mention All", + "permission_mention-all_description":"Permission to use the @all mention", + + "permission_mute-user":"Mute User", + "permission_mute-user_description":"Permission to mute other users in the same channel", + + "permission_pin-message":"Pin Message", + "permission_pin-message_description":"Permission to pin a message in a channel", + + "permission_post-readonly":"Post ReadOnly", + "permission_post-readonly_description":"Permission to post a message in a read-only channel", + + "permission_preview-c-room":"Preview Public Channel", + "permission_preview-c-room_description":"Permission view the contents of a public channel before joining", + + "permission_remove-user":"Remove User", + "permission_remove-user_description":"Permission to remove a user from a room", + + "permission_run-import":"Run Import", + "permission_run-import_description":"Permission to run the importers", + + "permission_run-migration":"Run Migration", + "permission_run-migration_description":"Permission to run the migrations", + + "permission_save-others-livechat-room-info":"Save Others Livechat Room Info", + "permission_save-others-livechat-room-info_description":"Permission to save information from other livechat channels", + + "permission_set-moderator":"Set Moderator", + "permission_set-moderator_description":"Permission to set other users as moderator of a channel", + + "permission_set-owner":"Set Owner", + "permission_set-owner_description":"Permission to set other users as owner of a channel", + + "permission_set-react-when-readonly":"Set React When ReadOnly", + "permission_set-react-when-readonly_description":"Permission to set the ability to react to messages in a read only channel", + + "permission_set-readonly":"Set ReadOnly", + "permission_set-readonly_description":"Permission to set a channel to read only channel", + + "permission_snippet-message":"Snippet Message", + "permission_snippet-message_description":"Permission to create snippet message", + + "permission_unarchive-room":"Unarchive Room", + "permission_unarchive-room_description":"Permission to unarchive channels", + + "permission_user-generate-access-token":"User Generate Access Token", + "permission_user-generate-access-token_description":"Permission to users generate access tokens", + + "permission_view-c-room":"View Public Channel", + "permission_view-c-room_description":"Permission to view public channels", + + "permission_view-d-room":"View Direct Messages", + "permission_view-d-room_description":"Permission to view direct messages", + + "permission_view-full-other-user-info":"View Full Other User Info", + "permission_view-full-other-user-info_description":"Permission to view full profile of other users including account creation date, last login, etc.", + + "permission_view-history":"View History", + "permission_view-history_description":"Permission to view the channel history", + + "permission_view-join-code":"View Join Code", + "permission_view-join-code_description":"Permission to view the channel join code", + + "permission_view-joined-room":"View Joined Room", + "permission_view-joined-room_description":"Permission to view the currently joined channels", + + "permission_view-l-room":"View Livechat Room", + "permission_view-l-room_description":"Permission to view livechat channels", + + "permission_view-livechat-manager":"View Livechat Manager", + "permission_view-livechat-manager_description":"Permission to view other livechat managers", + + "permission_view-livechat-rooms":"View Livechat Rooms", + "permission_view-livechat-rooms_description":"Permission to view other livechat channels", + + "permission_view-logs":"View Logs", + "permission_view-logs_description":"Permission to view the server logs ", + + "permission_view-p-room":"View Private Room", + "permission_view-p-room_description":"Permission to view private channels", + + "permission_view-privileged-setting":"View Privileged Setting", + "permission_view-privileged-setting_description":"Permission to view settings", + + "permission_view-room-administration":"View Room Administration", + "permission_view-room-administration_description":"Permission to view public, private and direct message statistics. Does not include the ability to view conversations or archives", + + "permission_view-statistics":"View Private Room", + "permission_view-statistics_description":"Permission o view system statistics such as number of users logged in, number of rooms, operating system information", + + "permission_view-user-administration":"View User Administration", + "permission_view-user-administration_description":"Permission to partial, read-only list view of other user accounts currently logged into the system. No user account information is accessible with this permission", + + + + + + + + + + + + + + + + + + + + + + + + + + + "Pin_Message": "Pin Message", "Pinned_a_message": "Pinned a message:", "Pinned_Messages": "Pinned Messages", From 39243639e2445f6fb17aad3230911674d96fde3e Mon Sep 17 00:00:00 2001 From: Martin Schoeler Date: Tue, 13 Jun 2017 11:40:29 -0300 Subject: [PATCH 2/6] Translate permissions names and add descriptions to them --- .../client/stylesheets/permissions.less | 4 ++++ .../rocketchat-authorization/client/views/permissions.html | 2 +- .../rocketchat-authorization/client/views/permissions.js | 5 ++++- packages/rocketchat-authorization/server/startup.js | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/rocketchat-authorization/client/stylesheets/permissions.less b/packages/rocketchat-authorization/client/stylesheets/permissions.less index c970dbf8d1f2..f82ebed1bb64 100644 --- a/packages/rocketchat-authorization/client/stylesheets/permissions.less +++ b/packages/rocketchat-authorization/client/stylesheets/permissions.less @@ -28,6 +28,10 @@ left: 50%; transform: translateX(-50%); } + + .permission-name { + cursor: default; + } } .empty-role { diff --git a/packages/rocketchat-authorization/client/views/permissions.html b/packages/rocketchat-authorization/client/views/permissions.html index 9199a2ae0c03..683f6c091c33 100644 --- a/packages/rocketchat-authorization/client/views/permissions.html +++ b/packages/rocketchat-authorization/client/views/permissions.html @@ -19,7 +19,7 @@ {{#each permission}} - {{_ permissionName}} + {{_ permissionName}} {{#each role}} diff --git a/packages/rocketchat-authorization/client/views/permissions.js b/packages/rocketchat-authorization/client/views/permissions.js index dd17fb044028..e20f156b899f 100644 --- a/packages/rocketchat-authorization/client/views/permissions.js +++ b/packages/rocketchat-authorization/client/views/permissions.js @@ -6,7 +6,6 @@ Template.permissions.helpers({ }, permission() { - console.log(ChatPermissions.find({}, {}).fetch()); return ChatPermissions.find({}, { sort: { _id: 1 @@ -26,6 +25,10 @@ Template.permissions.helpers({ return `permission_${ this._id }`; }, + permissionDescription() { + return `permission_${ this._id }_description`; + }, + hasPermission() { return RocketChat.authz.hasAllPermission('access-permissions'); } diff --git a/packages/rocketchat-authorization/server/startup.js b/packages/rocketchat-authorization/server/startup.js index 7378c47c1066..d6f67a60b557 100644 --- a/packages/rocketchat-authorization/server/startup.js +++ b/packages/rocketchat-authorization/server/startup.js @@ -64,11 +64,11 @@ Meteor.startup(function() { { _id: 'preview-c-room', roles : ['admin', 'user', 'anonymous'] } ]; - permissions.forEach(o => { o.i18nLabel = `permission_${ o._id }_description` ; }); + //permissions.forEach(o => { o.i18nLabel = `permission_${ o._id }_description` ; }); for (const permission of permissions) { if (!RocketChat.models.Permissions.findOneById(permission._id)) { - RocketChat.models.Permissions.upsert(permission._id, {i18nLabel: permission.i18nLabel}, {$set: permission }); + RocketChat.models.Permissions.upsert(permission._id, {$set: permission }); } } From ba357419a4b258a3d788c61bae9162fe425c5ad6 Mon Sep 17 00:00:00 2001 From: Martin Schoeler Date: Tue, 13 Jun 2017 13:32:29 -0300 Subject: [PATCH 3/6] remove prefix from the i18n strings (not sorted) --- .../client/views/permissions.js | 4 +- packages/rocketchat-i18n/i18n/en.i18n.json | 312 ++++++++---------- 2 files changed, 146 insertions(+), 170 deletions(-) diff --git a/packages/rocketchat-authorization/client/views/permissions.js b/packages/rocketchat-authorization/client/views/permissions.js index e20f156b899f..6205927af5a1 100644 --- a/packages/rocketchat-authorization/client/views/permissions.js +++ b/packages/rocketchat-authorization/client/views/permissions.js @@ -22,11 +22,11 @@ Template.permissions.helpers({ }, permissionName() { - return `permission_${ this._id }`; + return `${ this._id }`; }, permissionDescription() { - return `permission_${ this._id }_description`; + return `${ this._id }_description`; }, hasPermission() { diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index 24f6ab2e4e38..982cff8d3d95 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -1155,246 +1155,222 @@ "People": "People", "Permalink": "Permalink", "Permissions": "Permissions", - //empty lines are for ease of reviewing this pr. They will be removed before merging - "permission_access-mailer":"Access Mailer Screen", - "permission_access-mailer_description":"Permission to send mass email to all users.", + "access-mailer":"Access Mailer Screen", + "access-mailer_description":"Permission to send mass email to all users.", - "permission_access-permissions":"Access Permissions Screen", - "permission_access-permissions_description":"Modify permissions for various roles.", + "access-permissions":"Access Permissions Screen", + "access-permissions_description":"Modify permissions for various roles.", - "permission_add-oauth-service":"Add Oauth Service", - "permission_add-oauth-service_description":"Permission to add a new Oauth service", + "add-oauth-service":"Add Oauth Service", + "add-oauth-service_description":"Permission to add a new Oauth service", - "permission_add-user":"Add User", - "permission_add-user_description":"Permission to add new users to the server via users screen", + "add-user":"Add User", + "add-user_description":"Permission to add new users to the server via users screen", - "permission_add-user-to-any-c-room":"Add User to Any Public Channel", - "permission_add-user-to-any-c-room_description":"Permission to add a user to any public channel", + "add-user-to-any-c-room":"Add User to Any Public Channel", + "add-user-to-any-c-room_description":"Permission to add a user to any public channel", - "permission_add-user-to-any-p-room":"Add User to Any Private Channel", - "permission_add-user-to-any-p-room_description":"Permission to add a user to any private channel", + "add-user-to-any-p-room":"Add User to Any Private Channel", + "add-user-to-any-p-room_description":"Permission to add a user to any private channel", - "permission_add-user-to-joined-room":"Add User to Any Joined Channel", - "permission_add-user-to-joined-room_description":"Permission to add a user to a currently joined channel", + "add-user-to-joined-room":"Add User to Any Joined Channel", + "add-user-to-joined-room_description":"Permission to add a user to a currently joined channel", - "permission_archive-room":"Archive Room", - "permission_archive-room_description":"Permission to archive a channel", + "archive-room":"Archive Room", + "archive-room_description":"Permission to archive a channel", - "permission_assign-admin-role":"Assign Admin Role", - "permission_assign-admin-role_description":"Permission to assign the admin role to other users", + "assign-admin-role":"Assign Admin Role", + "assign-admin-role_description":"Permission to assign the admin role to other users", - "permission_auto-translate":"Auto Translate", - "permission_auto-translate_description":"Permission to use the auto translate tool", + "auto-translate":"Auto Translate", + "auto-translate_description":"Permission to use the auto translate tool", - "permission_ban-user":"Ban User", - "permission_ban-user_description":"Permission to assign the admin role to other users", + "ban-user":"Ban User", + "ban-user_description":"Permission to ban a user from a channel", - "permission_bulk-create-c":"Bulk Create Channels", - "permission_bulk-create-c_description":"Permission to create channels in bulk", + "bulk-create-c":"Bulk Create Channels", + "bulk-create-c_description":"Permission to create channels in bulk", - "permission_bulk-register-user":"Bulk Create Channels", - "permission_bulk-register-user_description":"Permission to create channels in bulk", + "bulk-register-user":"Bulk Create Channels", + "bulk-register-user_description":"Permission to create channels in bulk", - "permission_clean-channel-history":"Clean Channel History", - "permission_clean-channel-history_description":"Permission to Clear the history from channels", + "clean-channel-history":"Clean Channel History", + "clean-channel-history_description":"Permission to Clear the history from channels", - "permission_close-livechat-room":"Close Livechat Room", - "permission_close-livechat-room_description":"Permission to close the current LiveChat channel", + "close-livechat-room":"Close Livechat Room", + "close-livechat-room_description":"Permission to close the current LiveChat channel", - "permission_close-others-livechat-room":"Close Livechat Room", - "permission_close-others-livechat-room_description":"Permission to close other LiveChat channels", + "close-others-livechat-room":"Close Livechat Room", + "close-others-livechat-room_description":"Permission to close other LiveChat channels", - "permission_create-c":"Create Public Channels", - "permission_create-c_description":"Permission to create public channels", + "create-c":"Create Public Channels", + "create-c_description":"Permission to create public channels", - "permission_create-d":"Create Direct Messages", - "permission_create-d_description":"Permission to start direct messages", + "create-d":"Create Direct Messages", + "create-d_description":"Permission to start direct messages", - "permission_create-p":"Create Private Channels", - "permission_create-p_description":"Permission to create private channels", + "create-p":"Create Private Channels", + "create-p_description":"Permission to create private channels", - "permission_create-user":"Create User", - "permission_create-user_description":"Permission to create users", + "create-user":"Create User", + "create-user_description":"Permission to create users", - "permission_delete-c":"Delete Public Channels", - "permission_delete-c_description":"Permission to delete public channels", + "delete-c":"Delete Public Channels", + "delete-c_description":"Permission to delete public channels", - "permission_delete-d":"Delete Direct Messages", - "permission_delete-d_description":"Permission to delete direct messages", + "delete-d":"Delete Direct Messages", + "delete-d_description":"Permission to delete direct messages", - "permission_delete-p":"Delete Private Channels", - "permission_delete-p_description":"Permission to delete private channels", + "delete-p":"Delete Private Channels", + "delete-p_description":"Permission to delete private channels", - "permission_delete-message":"Delete Message", - "permission_delete-message_description":"Permission to delete a message within a room", + "delete-message":"Delete Message", + "delete-message_description":"Permission to delete a message within a room", - "permission_delete-user":"Delete User", - "permission_delete-user_description":"Permission to delete users", + "delete-user":"Delete User", + "delete-user_description":"Permission to delete users", - "permission_edit-message":"Edit Message", - "permission_edit-message_description":"Permission to edit a message within a room", + "edit-message":"Edit Message", + "edit-message_description":"Permission to edit a message within a room", - "permission_edit-other-user-active-status":"Edit Other User Active Status", - "permission_edit-other-user-active-status_description":"Permission to enable or disable other accounts", + "edit-other-user-active-status":"Edit Other User Active Status", + "edit-other-user-active-status_description":"Permission to enable or disable other accounts", - "permission_edit-other-user-info":"Edit Other User Information", - "permission_edit-other-user-info_description":"Permission to change other user’s name, username or email address.", + "edit-other-user-info":"Edit Other User Information", + "edit-other-user-info_description":"Permission to change other user’s name, username or email address.", - "permission_edit-other-user-password":"Edit Other User Password", - "permission_edit-other-user-password_description":"Permission to modify other user’s passwords. Requires edit-other-user-info permission.", + "edit-other-user-password":"Edit Other User Password", + "edit-other-user-password_description":"Permission to modify other user’s passwords. Requires edit-other-user-info permission.", - "permission_edit-privileged-setting":"Edit privileged Setting", - "permission_edit-privileged-setting_description":"Permission to edit settings", + "edit-privileged-setting":"Edit privileged Setting", + "edit-privileged-setting_description":"Permission to edit settings", - "permission_edit-room":"Edit Room", - "permission_edit-room_description":"Permission to edit a room’s name, topic, type (private or public status) and status (active or archived)", + "edit-room":"Edit Room", + "edit-room_description":"Permission to edit a room’s name, topic, type (private or public status) and status (active or archived)", - "permission_force-delete-message":"Force Delete Message", - "permission_force-delete-message_description":"Permission to delete a message bypassing all restrictions", + "force-delete-message":"Force Delete Message", + "force-delete-message_description":"Permission to delete a message bypassing all restrictions", - "permission_join-without-join-code":"Join Without Join Code", - "permission_join-without-join-code_description":"Permission to bypass the join code in channels with join code enabled", + "join-without-join-code":"Join Without Join Code", + "join-without-join-code_description":"Permission to bypass the join code in channels with join code enabled", - "permission_mail-messages":"Mail Messages", - "permission_mail-messages_description":"Permission to use the mail messages option", + "mail-messages":"Mail Messages", + "mail-messages_description":"Permission to use the mail messages option", - "permission_manage-assets":"Manage Assets", - "permission_manage-assets_description":"Permission to manage the server assets", + "manage-assets":"Manage Assets", + "manage-assets_description":"Permission to manage the server assets", - "permission_manage-emoji":"Manage Emoji", - "permission_manage-emoji_description":"Permission to manage the server emojis", + "manage-emoji":"Manage Emoji", + "manage-emoji_description":"Permission to manage the server emojis", - "permission_manage-integrations":"Manage Integrations", - "permission_manage-integrations_description":"Permission to manage the server integrations", + "manage-integrations":"Manage Integrations", + "manage-integrations_description":"Permission to manage the server integrations", - "permission_manage-oauth-apps":"Manage Oauth Apps", - "permission_manage-oauth-apps_description":"Permission to manage the server Oauth apps", + "manage-oauth-apps":"Manage Oauth Apps", + "manage-oauth-apps_description":"Permission to manage the server Oauth apps", - "permission_manage-own-integrations":"Manage Own Integrations", - "permission_manage-own-integrations_description":"Permition to users create and edit their own integration or webhooks", + "manage-own-integrations":"Manage Own Integrations", + "manage-own-integrations_description":"Permition to users create and edit their own integration or webhooks", - "permission_manage-sounds":"Manage Sounds", - "permission_manage-sounds_description":"Permission to manage the server sounds", + "manage-sounds":"Manage Sounds", + "manage-sounds_description":"Permission to manage the server sounds", - "permission_mention-all":"Mention All", - "permission_mention-all_description":"Permission to use the @all mention", + "mention-all":"Mention All", + "mention-all_description":"Permission to use the @all mention", - "permission_mute-user":"Mute User", - "permission_mute-user_description":"Permission to mute other users in the same channel", + "mute-user":"Mute User", + "mute-user_description":"Permission to mute other users in the same channel", - "permission_pin-message":"Pin Message", - "permission_pin-message_description":"Permission to pin a message in a channel", + "pin-message":"Pin Message", + "pin-message_description":"Permission to pin a message in a channel", - "permission_post-readonly":"Post ReadOnly", - "permission_post-readonly_description":"Permission to post a message in a read-only channel", + "post-readonly":"Post ReadOnly", + "post-readonly_description":"Permission to post a message in a read-only channel", - "permission_preview-c-room":"Preview Public Channel", - "permission_preview-c-room_description":"Permission view the contents of a public channel before joining", + "preview-c-room":"Preview Public Channel", + "preview-c-room_description":"Permission view the contents of a public channel before joining", - "permission_remove-user":"Remove User", - "permission_remove-user_description":"Permission to remove a user from a room", - - "permission_run-import":"Run Import", - "permission_run-import_description":"Permission to run the importers", - - "permission_run-migration":"Run Migration", - "permission_run-migration_description":"Permission to run the migrations", - - "permission_save-others-livechat-room-info":"Save Others Livechat Room Info", - "permission_save-others-livechat-room-info_description":"Permission to save information from other livechat channels", - - "permission_set-moderator":"Set Moderator", - "permission_set-moderator_description":"Permission to set other users as moderator of a channel", - - "permission_set-owner":"Set Owner", - "permission_set-owner_description":"Permission to set other users as owner of a channel", - - "permission_set-react-when-readonly":"Set React When ReadOnly", - "permission_set-react-when-readonly_description":"Permission to set the ability to react to messages in a read only channel", - - "permission_set-readonly":"Set ReadOnly", - "permission_set-readonly_description":"Permission to set a channel to read only channel", - - "permission_snippet-message":"Snippet Message", - "permission_snippet-message_description":"Permission to create snippet message", - - "permission_unarchive-room":"Unarchive Room", - "permission_unarchive-room_description":"Permission to unarchive channels", - - "permission_user-generate-access-token":"User Generate Access Token", - "permission_user-generate-access-token_description":"Permission to users generate access tokens", - - "permission_view-c-room":"View Public Channel", - "permission_view-c-room_description":"Permission to view public channels", - - "permission_view-d-room":"View Direct Messages", - "permission_view-d-room_description":"Permission to view direct messages", - - "permission_view-full-other-user-info":"View Full Other User Info", - "permission_view-full-other-user-info_description":"Permission to view full profile of other users including account creation date, last login, etc.", - - "permission_view-history":"View History", - "permission_view-history_description":"Permission to view the channel history", - - "permission_view-join-code":"View Join Code", - "permission_view-join-code_description":"Permission to view the channel join code", - - "permission_view-joined-room":"View Joined Room", - "permission_view-joined-room_description":"Permission to view the currently joined channels", - - "permission_view-l-room":"View Livechat Room", - "permission_view-l-room_description":"Permission to view livechat channels", - - "permission_view-livechat-manager":"View Livechat Manager", - "permission_view-livechat-manager_description":"Permission to view other livechat managers", - - "permission_view-livechat-rooms":"View Livechat Rooms", - "permission_view-livechat-rooms_description":"Permission to view other livechat channels", - - "permission_view-logs":"View Logs", - "permission_view-logs_description":"Permission to view the server logs ", - - "permission_view-p-room":"View Private Room", - "permission_view-p-room_description":"Permission to view private channels", - - "permission_view-privileged-setting":"View Privileged Setting", - "permission_view-privileged-setting_description":"Permission to view settings", - - "permission_view-room-administration":"View Room Administration", - "permission_view-room-administration_description":"Permission to view public, private and direct message statistics. Does not include the ability to view conversations or archives", - - "permission_view-statistics":"View Private Room", - "permission_view-statistics_description":"Permission o view system statistics such as number of users logged in, number of rooms, operating system information", - - "permission_view-user-administration":"View User Administration", - "permission_view-user-administration_description":"Permission to partial, read-only list view of other user accounts currently logged into the system. No user account information is accessible with this permission", + "remove-user":"Remove User", + "remove-user_description":"Permission to remove a user from a room", + "run-import":"Run Import", + "run-import_description":"Permission to run the importers", + "run-migration":"Run Migration", + "run-migration_description":"Permission to run the migrations", + "save-others-livechat-room-info":"Save Others Livechat Room Info", + "save-others-livechat-room-info_description":"Permission to save information from other livechat channels", + "set-moderator":"Set Moderator", + "set-moderator_description":"Permission to set other users as moderator of a channel", + "set-owner":"Set Owner", + "set-owner_description":"Permission to set other users as owner of a channel", + "set-react-when-readonly":"Set React When ReadOnly", + "set-react-when-readonly_description":"Permission to set the ability to react to messages in a read only channel", + "set-readonly":"Set ReadOnly", + "set-readonly_description":"Permission to set a channel to read only channel", + "snippet-message":"Snippet Message", + "snippet-message_description":"Permission to create snippet message", + "unarchive-room":"Unarchive Room", + "unarchive-room_description":"Permission to unarchive channels", + "user-generate-access-token":"User Generate Access Token", + "user-generate-access-token_description":"Permission to users generate access tokens", + "view-c-room":"View Public Channel", + "view-c-room_description":"Permission to view public channels", + "view-d-room":"View Direct Messages", + "view-d-room_description":"Permission to view direct messages", + "view-full-other-user-info":"View Full Other User Info", + "view-full-other-user-info_description":"Permission to view full profile of other users including account creation date, last login, etc.", + "view-history":"View History", + "view-history_description":"Permission to view the channel history", + "view-join-code":"View Join Code", + "view-join-code_description":"Permission to view the channel join code", + "view-joined-room":"View Joined Room", + "view-joined-room_description":"Permission to view the currently joined channels", + "view-l-room":"View Livechat Rooms", + "view-l-room_description":"Permission to view livechat channels", + "view-livechat-manager":"View Livechat Manager", + "view-livechat-manager_description":"Permission to view other livechat managers", + "view-livechat-rooms":"View Livechat Rooms", + "view-livechat-rooms_description":"Permission to view other livechat channels", + "view-logs":"View Logs", + "view-logs_description":"Permission to view the server logs ", + "view-p-room":"View Private Room", + "view-p-room_description":"Permission to view private channels", + "view-privileged-setting":"View Privileged Setting", + "view-privileged-setting_description":"Permission to view settings", + "view-other-user-channels":"View Other User Channels", + "view-other-user-channels_description":"Permission to view channels owned by other users", + "view-room-administration":"View Room Administration", + "view-room-administration_description":"Permission to view public, private and direct message statistics. Does not include the ability to view conversations or archives", + "view-statistics":"View Private Room", + "view-statistics_description":"Permission o view system statistics such as number of users logged in, number of rooms, operating system information", + "view-user-administration":"View User Administration", + "view-user-administration_description":"Permission to partial, read-only list view of other user accounts currently logged into the system. No user account information is accessible with this permission", "Pin_Message": "Pin Message", "Pinned_a_message": "Pinned a message:", From b10d9968819fe663d23f03d8af5389187047dfa6 Mon Sep 17 00:00:00 2001 From: Martin Schoeler Date: Tue, 13 Jun 2017 13:39:04 -0300 Subject: [PATCH 4/6] clean up code --- packages/rocketchat-authorization/server/startup.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/rocketchat-authorization/server/startup.js b/packages/rocketchat-authorization/server/startup.js index d6f67a60b557..3fe7771125de 100644 --- a/packages/rocketchat-authorization/server/startup.js +++ b/packages/rocketchat-authorization/server/startup.js @@ -64,8 +64,6 @@ Meteor.startup(function() { { _id: 'preview-c-room', roles : ['admin', 'user', 'anonymous'] } ]; - //permissions.forEach(o => { o.i18nLabel = `permission_${ o._id }_description` ; }); - for (const permission of permissions) { if (!RocketChat.models.Permissions.findOneById(permission._id)) { RocketChat.models.Permissions.upsert(permission._id, {$set: permission }); From bc546b7ed58d65756dcc51b42e236096fd0000a3 Mon Sep 17 00:00:00 2001 From: Martin Schoeler Date: Fri, 30 Jun 2017 17:07:18 -0300 Subject: [PATCH 5/6] revert i18n sorting --- .../client/views/permissions.html | 2 +- packages/rocketchat-i18n/i18n/en.i18n.json | 75 +------------------ 2 files changed, 2 insertions(+), 75 deletions(-) diff --git a/packages/rocketchat-authorization/client/views/permissions.html b/packages/rocketchat-authorization/client/views/permissions.html index 683f6c091c33..e0e47d6b426d 100644 --- a/packages/rocketchat-authorization/client/views/permissions.html +++ b/packages/rocketchat-authorization/client/views/permissions.html @@ -19,7 +19,7 @@ {{#each permission}} - {{_ permissionName}} + {{_ permissionName}}
[{{_id}}] {{#each role}} diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index 982cff8d3d95..e9cdb23e3dd8 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -1155,223 +1155,150 @@ "People": "People", "Permalink": "Permalink", "Permissions": "Permissions", - "access-mailer":"Access Mailer Screen", "access-mailer_description":"Permission to send mass email to all users.", - "access-permissions":"Access Permissions Screen", "access-permissions_description":"Modify permissions for various roles.", - "add-oauth-service":"Add Oauth Service", "add-oauth-service_description":"Permission to add a new Oauth service", - "add-user":"Add User", "add-user_description":"Permission to add new users to the server via users screen", - "add-user-to-any-c-room":"Add User to Any Public Channel", "add-user-to-any-c-room_description":"Permission to add a user to any public channel", - "add-user-to-any-p-room":"Add User to Any Private Channel", "add-user-to-any-p-room_description":"Permission to add a user to any private channel", - "add-user-to-joined-room":"Add User to Any Joined Channel", "add-user-to-joined-room_description":"Permission to add a user to a currently joined channel", - "archive-room":"Archive Room", "archive-room_description":"Permission to archive a channel", - "assign-admin-role":"Assign Admin Role", "assign-admin-role_description":"Permission to assign the admin role to other users", - "auto-translate":"Auto Translate", "auto-translate_description":"Permission to use the auto translate tool", - "ban-user":"Ban User", "ban-user_description":"Permission to ban a user from a channel", - "bulk-create-c":"Bulk Create Channels", "bulk-create-c_description":"Permission to create channels in bulk", - "bulk-register-user":"Bulk Create Channels", "bulk-register-user_description":"Permission to create channels in bulk", - "clean-channel-history":"Clean Channel History", "clean-channel-history_description":"Permission to Clear the history from channels", - "close-livechat-room":"Close Livechat Room", "close-livechat-room_description":"Permission to close the current LiveChat channel", - "close-others-livechat-room":"Close Livechat Room", "close-others-livechat-room_description":"Permission to close other LiveChat channels", - "create-c":"Create Public Channels", "create-c_description":"Permission to create public channels", - "create-d":"Create Direct Messages", "create-d_description":"Permission to start direct messages", - "create-p":"Create Private Channels", "create-p_description":"Permission to create private channels", - "create-user":"Create User", "create-user_description":"Permission to create users", - "delete-c":"Delete Public Channels", "delete-c_description":"Permission to delete public channels", - "delete-d":"Delete Direct Messages", "delete-d_description":"Permission to delete direct messages", - "delete-p":"Delete Private Channels", "delete-p_description":"Permission to delete private channels", - "delete-message":"Delete Message", "delete-message_description":"Permission to delete a message within a room", - "delete-user":"Delete User", "delete-user_description":"Permission to delete users", - "edit-message":"Edit Message", "edit-message_description":"Permission to edit a message within a room", - "edit-other-user-active-status":"Edit Other User Active Status", "edit-other-user-active-status_description":"Permission to enable or disable other accounts", - "edit-other-user-info":"Edit Other User Information", "edit-other-user-info_description":"Permission to change other user’s name, username or email address.", - "edit-other-user-password":"Edit Other User Password", "edit-other-user-password_description":"Permission to modify other user’s passwords. Requires edit-other-user-info permission.", - "edit-privileged-setting":"Edit privileged Setting", "edit-privileged-setting_description":"Permission to edit settings", - "edit-room":"Edit Room", "edit-room_description":"Permission to edit a room’s name, topic, type (private or public status) and status (active or archived)", - "force-delete-message":"Force Delete Message", "force-delete-message_description":"Permission to delete a message bypassing all restrictions", - "join-without-join-code":"Join Without Join Code", "join-without-join-code_description":"Permission to bypass the join code in channels with join code enabled", - "mail-messages":"Mail Messages", "mail-messages_description":"Permission to use the mail messages option", - "manage-assets":"Manage Assets", "manage-assets_description":"Permission to manage the server assets", - "manage-emoji":"Manage Emoji", "manage-emoji_description":"Permission to manage the server emojis", - "manage-integrations":"Manage Integrations", "manage-integrations_description":"Permission to manage the server integrations", - "manage-oauth-apps":"Manage Oauth Apps", "manage-oauth-apps_description":"Permission to manage the server Oauth apps", - "manage-own-integrations":"Manage Own Integrations", "manage-own-integrations_description":"Permition to users create and edit their own integration or webhooks", - "manage-sounds":"Manage Sounds", "manage-sounds_description":"Permission to manage the server sounds", - "mention-all":"Mention All", "mention-all_description":"Permission to use the @all mention", - "mute-user":"Mute User", "mute-user_description":"Permission to mute other users in the same channel", - "pin-message":"Pin Message", "pin-message_description":"Permission to pin a message in a channel", - "post-readonly":"Post ReadOnly", "post-readonly_description":"Permission to post a message in a read-only channel", - "preview-c-room":"Preview Public Channel", "preview-c-room_description":"Permission view the contents of a public channel before joining", - "remove-user":"Remove User", "remove-user_description":"Permission to remove a user from a room", - "run-import":"Run Import", "run-import_description":"Permission to run the importers", - "run-migration":"Run Migration", "run-migration_description":"Permission to run the migrations", - "save-others-livechat-room-info":"Save Others Livechat Room Info", "save-others-livechat-room-info_description":"Permission to save information from other livechat channels", - "set-moderator":"Set Moderator", "set-moderator_description":"Permission to set other users as moderator of a channel", - "set-owner":"Set Owner", "set-owner_description":"Permission to set other users as owner of a channel", - "set-react-when-readonly":"Set React When ReadOnly", "set-react-when-readonly_description":"Permission to set the ability to react to messages in a read only channel", - "set-readonly":"Set ReadOnly", "set-readonly_description":"Permission to set a channel to read only channel", - "snippet-message":"Snippet Message", "snippet-message_description":"Permission to create snippet message", - "unarchive-room":"Unarchive Room", "unarchive-room_description":"Permission to unarchive channels", - "user-generate-access-token":"User Generate Access Token", "user-generate-access-token_description":"Permission to users generate access tokens", - "view-c-room":"View Public Channel", "view-c-room_description":"Permission to view public channels", - "view-d-room":"View Direct Messages", "view-d-room_description":"Permission to view direct messages", - "view-full-other-user-info":"View Full Other User Info", "view-full-other-user-info_description":"Permission to view full profile of other users including account creation date, last login, etc.", - "view-history":"View History", "view-history_description":"Permission to view the channel history", - "view-join-code":"View Join Code", "view-join-code_description":"Permission to view the channel join code", - "view-joined-room":"View Joined Room", "view-joined-room_description":"Permission to view the currently joined channels", - "view-l-room":"View Livechat Rooms", "view-l-room_description":"Permission to view livechat channels", - "view-livechat-manager":"View Livechat Manager", "view-livechat-manager_description":"Permission to view other livechat managers", - "view-livechat-rooms":"View Livechat Rooms", "view-livechat-rooms_description":"Permission to view other livechat channels", - "view-logs":"View Logs", "view-logs_description":"Permission to view the server logs ", - "view-p-room":"View Private Room", "view-p-room_description":"Permission to view private channels", - "view-privileged-setting":"View Privileged Setting", "view-privileged-setting_description":"Permission to view settings", - "view-other-user-channels":"View Other User Channels", "view-other-user-channels_description":"Permission to view channels owned by other users", - "view-room-administration":"View Room Administration", "view-room-administration_description":"Permission to view public, private and direct message statistics. Does not include the ability to view conversations or archives", - "view-statistics":"View Private Room", "view-statistics_description":"Permission o view system statistics such as number of users logged in, number of rooms, operating system information", - "view-user-administration":"View User Administration", "view-user-administration_description":"Permission to partial, read-only list view of other user accounts currently logged into the system. No user account information is accessible with this permission", - "Pin_Message": "Pin Message", "Pinned_a_message": "Pinned a message:", "Pinned_Messages": "Pinned Messages", @@ -1942,4 +1869,4 @@ "your_message_optional": "your message (optional)", "Your_password_is_wrong": "Your password is wrong!", "Your_push_was_sent_to_s_devices": "Your push was sent to %s devices" -} +} \ No newline at end of file From 2e8251d805d350518854b343379237b1b59e6f07 Mon Sep 17 00:00:00 2001 From: Martin Schoeler Date: Fri, 30 Jun 2017 17:14:24 -0300 Subject: [PATCH 6/6] fix typos --- packages/rocketchat-i18n/i18n/en.i18n.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index e9cdb23e3dd8..c420047213a3 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -1232,7 +1232,7 @@ "manage-oauth-apps":"Manage Oauth Apps", "manage-oauth-apps_description":"Permission to manage the server Oauth apps", "manage-own-integrations":"Manage Own Integrations", - "manage-own-integrations_description":"Permition to users create and edit their own integration or webhooks", + "manage-own-integrations_description":"Permition to allow users to create and edit their own integration or webhooks", "manage-sounds":"Manage Sounds", "manage-sounds_description":"Permission to manage the server sounds", "mention-all":"Mention All", @@ -1244,7 +1244,7 @@ "post-readonly":"Post ReadOnly", "post-readonly_description":"Permission to post a message in a read-only channel", "preview-c-room":"Preview Public Channel", - "preview-c-room_description":"Permission view the contents of a public channel before joining", + "preview-c-room_description":"Permission to view the contents of a public channel before joining", "remove-user":"Remove User", "remove-user_description":"Permission to remove a user from a room", "run-import":"Run Import", @@ -1266,7 +1266,7 @@ "unarchive-room":"Unarchive Room", "unarchive-room_description":"Permission to unarchive channels", "user-generate-access-token":"User Generate Access Token", - "user-generate-access-token_description":"Permission to users generate access tokens", + "user-generate-access-token_description":"Permission for users to generate access tokens", "view-c-room":"View Public Channel", "view-c-room_description":"Permission to view public channels", "view-d-room":"View Direct Messages", @@ -1295,7 +1295,7 @@ "view-other-user-channels_description":"Permission to view channels owned by other users", "view-room-administration":"View Room Administration", "view-room-administration_description":"Permission to view public, private and direct message statistics. Does not include the ability to view conversations or archives", - "view-statistics":"View Private Room", + "view-statistics":"View Statistics", "view-statistics_description":"Permission o view system statistics such as number of users logged in, number of rooms, operating system information", "view-user-administration":"View User Administration", "view-user-administration_description":"Permission to partial, read-only list view of other user accounts currently logged into the system. No user account information is accessible with this permission",