paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-19 22:19:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

emoji: Don't lock out admins when only admins are allowed to upload emoji.

Browse Source 
Prior to this, when the setting for controlling whether can admins only
upload an emoji was set to true, we were not displaying upload emoji form
even for admins and as a result they were locked out.
This commit is contained in:
Harshit Bansal
2017-07-11 19:59:40 +00:00
committed by Tim Abbott
parent db3539438c
commit 86de196d12
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
static/js/admin.js
View File

@@ -38,6 +38,7 @@ function _setup_page() {
realm_name_changes_disabled: page_params.realm_name_changes_disabled, realm_name_changes_disabled: page_params.realm_name_changes_disabled,
realm_email_changes_disabled: page_params.realm_email_changes_disabled, realm_email_changes_disabled: page_params.realm_email_changes_disabled,
realm_add_emoji_by_admins_only: page_params.realm_add_emoji_by_admins_only, realm_add_emoji_by_admins_only: page_params.realm_add_emoji_by_admins_only,
can_admin_emojis: page_params.is_admin || !page_params.realm_add_emoji_by_admins_only,
realm_allow_message_editing: page_params.realm_allow_message_editing, realm_allow_message_editing: page_params.realm_allow_message_editing,
realm_message_content_edit_limit_minutes: realm_message_content_edit_limit_minutes:
Math.ceil(page_params.realm_message_content_edit_limit_seconds / 60), Math.ceil(page_params.realm_message_content_edit_limit_seconds / 60),

4
static/templates/settings/emoji-settings-admin.handlebars
View File

@@ -15,8 +15,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
{{#unless realm_add_emoji_by_admins_only}} <form class="form-horizontal admin-emoji-form {{#unless can_admin_emojis}}hide{{/unless}}">
<form class="form-horizontal admin-emoji-form">
<div class="add-new-emoji-box grey-bg green-bg"> <div class="add-new-emoji-box grey-bg green-bg">
<div class="new-emoji-form"> <div class="new-emoji-form">
<div class="settings-section-title new-emoji-section-title no-padding">{{t "Add a new emoji" }}</div> <div class="settings-section-title new-emoji-section-title no-padding">{{t "Add a new emoji" }}</div>
@@ -39,5 +38,4 @@
</div> </div>
</div> </div>
</form> </form>
{{/unless}}
</div> </div>