Browse Source

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"
Lauri Ojansivu 7 years ago
parent
commit
a003161fa7
2 changed files with 4 additions and 2 deletions
  1. 2 1
      CHANGELOG.md
  2. 2 1
      client/components/cards/labels.jade

+ 2 - 1
CHANGELOG.md

@@ -6,7 +6,8 @@ This release adds the following new features:
 
 
 and fixes the following bugs:
 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.
 Thanks to Github user nztqa for contributions.
 
 

+ 2 - 1
client/components/cards/labels.jade

@@ -34,4 +34,5 @@ template(name="cardLabelsPopup")
             = name
             = name
             if(isLabelSelected ../_id)
             if(isLabelSelected ../_id)
               i.card-label-selectable-icon.fa.fa-check
               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'}}