This repository has been archived by the owner on Mar 13, 2024. It is now read-only.
Using new splited emojis and webhooks permissions #2339
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jespino
changed the title
jespino
added
2: Dev Review
|
The tests are failing because it needs the mattermost-redux PR merged. |
grundleborg
suggested changes
Feb 8, 2019
components/admin_console/permission_schemes_settings/permission_schemes_settings.jsx
Show resolved
Hide resolved
grundleborg
reviewed
Feb 11, 2019
| @@ -875,6 +881,10 @@ | |||
| "admin.permissions.permission.manage_team.name": "Manage team", | |||
| "admin.permissions.permission.manage_webhooks.description": "Create, edit, and delete incoming and outgoing webhooks.", | |||
| "admin.permissions.permission.manage_webhooks.name": "Manage Webhooks", | |||
| "admin.permissions.permission.manage_incoming_webhooks.description": "Create, edit, and delete incoming webhooks.", | |||
There was a problem hiding this comment.
Do the old translation strings also need to be removed from here, or will that get done automatically now?
There was a problem hiding this comment.
Can be done automatically using the tool, but must be committed.
mkraft
reviewed
Feb 12, 2019
| {roleName: 'team_user', permission: Permissions.MANAGE_SLASH_COMMANDS, shouldHave: false}, | ||
| {roleName: 'system_user', permission: Permissions.MANAGE_OAUTH, shouldHave: false}, | ||
| ], | ||
| false: [ | ||
| {roleName: 'team_user', permission: Permissions.MANAGE_WEBHOOKS, shouldHave: true}, | ||
| {roleName: 'team_user', permission: Permissions.MANAGE_INCOMING_WEBHOOKS, shouldHave: true}, | ||
| {roleName: 'team_user', permission: Permissions.MANAGE_OUTGOING_WEBHOOKS, shouldHave: true}, |
There was a problem hiding this comment.
Ah OK I see you updated the adapter here 👍
| "admin.permissions.permission.delete_emojis.description": "Delete custom emoji.", | ||
| "admin.permissions.permission.delete_emojis.name": "Delete Custom Emoji", | ||
| "admin.permissions.permission.delete_others_emojis.description": "Delete others' custom emoji.", | ||
| "admin.permissions.permission.delete_others_emojis.name": "Delete Others' Custom Emoji", |
There was a problem hiding this comment.
Do we need the descriptions if they simply echo the names or could they be left blank?
There was a problem hiding this comment.
I would say they must be different string, no matter if they are equal, because in the future they can change, and they can change independently. From my perspective they are different text that are temporary equal because are related, but aren't the same text.
jespino
force-pushed
the
MM-11101
branch
3 times, most recently
from
9c475ad
to
136c905
Compare
|
@mkraft please could you re-review this when you have a moment? I'd like to get it merged sooner rather than later. |
mkraft
approved these changes
Mar 5, 2019
grundleborg
added
4: Reviews Complete
amyblais
added
Changelog/Done
stevepartridge
pushed a commit
to stevepartridge/mattermost-webapp
that referenced
this pull request
Mar 30, 2019
* Using new splited emojis and webhooks permissions * Fixed review comments * Removed unnecesary translations * Fixing tests after redux is merged
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Using new splited emojis and webhooks permissions
Ticket Link
MM-11101
Checklist
make check-styleto check for style errors (required for all pull requests)make testto ensure unit and component tests passed