diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-10-01 09:58:35 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-10-01 09:58:35 +0300 |
| commit | a003161fa74a52f8567be6238d6890a88d091d54 (patch) | |
| tree | f02cf0dabefe0f69a21613c7efd4a452cfb79912 | |
| parent | a1d06727399a0d5a0cc11aee6a16ea253548727d (diff) | |
| parent | 51fd053119133cb4c76efc13b769e864b1c6817a (diff) | |
| download | wekan-a003161fa74a52f8567be6238d6890a88d091d54.tar.gz wekan-a003161fa74a52f8567be6238d6890a88d091d54.tar.bz2 wekan-a003161fa74a52f8567be6238d6890a88d091d54.zip | |
Merge branch 'nztqa-fix-create_label' into devel
git commit CHANGELOG.md -m "Hide create label from normal users, because only board admin can create labels.
Thanks to nztqa ! Closes #1229"
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | client/components/cards/labels.jade | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 29ae3e9e..8c626610 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ This release adds the following new features: and fixes the following bugs: -* [Data inconsistency when copying card](https://github.com/wekan/wekan/pull/1246). Note: There is no feature for copying card attachment yet. +* [Data inconsistency when copying card](https://github.com/wekan/wekan/pull/1246). Note: There is no feature for copying card attachment yet; +* [Hide create label from normal users, because only board admin can create labels](https://github.com/wekan/wekan/pull/1261). Thanks to Github user nztqa for contributions. diff --git a/client/components/cards/labels.jade b/client/components/cards/labels.jade index 31bd4d06..6c6efb08 100644 --- a/client/components/cards/labels.jade +++ b/client/components/cards/labels.jade @@ -34,4 +34,5 @@ template(name="cardLabelsPopup") = name if(isLabelSelected ../_id) i.card-label-selectable-icon.fa.fa-check - a.quiet-button.full.js-add-label {{_ 'label-create'}} + if currentUser.isBoardAdmin + a.quiet-button.full.js-add-label {{_ 'label-create'}} |