Merge pull request #862 from crossroads/master

HOT FIX => Restore organisations_user menu item
crossroads · Sep 4, 2020 · 85a6ea4 · 85a6ea4
2 parents 7cf18df + 87e0351
commit 85a6ea4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/app/templates/app_menu_list.hbs b/app/templates/app_menu_list.hbs
@@ -40,16 +40,25 @@
           <div class="option-subtext">{{t 'manage_users'}}</div>
         {{/link-to}}
       </div>
-      {{#if (is-or getCurrentUser.canManageStocktakes getCurrentUser.canManageStocktakeRevisions)}}
+      <div class="small-4 columns menu-option">
+        {{#link-to 'search_organisation' class="menu-list-anchor"}}
+          <div class="menu-svg">{{fa-icon 'user-cog' size="lg"}}</div>
+          <br>
+          <div class="option-subtext">{{t 'manage_charity_users'}}</div>
+        {{/link-to}}
+      </div>
+    </div>
+    {{#if (is-or getCurrentUser.canManageStocktakes getCurrentUser.canManageStocktakeRevisions)}}
+      <div class="row menu-margin">
         <div class="small-4 columns menu-option">
           {{#link-to 'stocktakes' class="menu-list-anchor"}}
             <div class="menu-svg">{{fa-icon 'list-ol' size="lg"}}</div>
             <br>
             <div class="option-subtext">{{t 'stocktakes.title'}}</div>
           {{/link-to}}
         </div>
-      {{/if}}
-    </div>
+      </div>
+    {{/if}}
   </div>
 
   <div class="row">

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stock",
-  "version": "0.19.9",
+  "version": "0.20.0",
   "private": true,
   "directories": {
     "doc": "doc",