client/auth: fix swapped tag deleting and merging

2016-08-23 21:56:48 +02:00 · 2016-08-23 21:56:48 +02:00 · 3ff48667a0
parent 34022d8fc8
commit 3ff48667a0
1 changed files with 2 additions and 2 deletions
--- a/client/js/controllers/tag_controller.js
+++ b/client/js/controllers/tag_controller.js
@ -38,8 +38,8 @@ class TagController {
                canEditImplications: api.hasPrivilege('tags:edit:implications'),
                canEditSuggestions: api.hasPrivilege('tags:edit:suggestions'),
                canEditDescription: api.hasPrivilege('tags:edit:description'),
-                canMerge: api.hasPrivilege('tags:delete'),
-                canDelete: api.hasPrivilege('tags:merge'),
+                canMerge: api.hasPrivilege('tags:merge'),
+                canDelete: api.hasPrivilege('tags:delete'),
                categories: categories,
            });