Skip to content

Commit 85a6ea4

Browse files
Merge pull request #862 from crossroads/master
HOT FIX => Restore organisations_user menu item
2 parents 7cf18df + 87e0351 commit 85a6ea4

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

app/templates/app_menu_list.hbs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,25 @@
4040
<div class="option-subtext">{{t 'manage_users'}}</div>
4141
{{/link-to}}
4242
</div>
43-
{{#if (is-or getCurrentUser.canManageStocktakes getCurrentUser.canManageStocktakeRevisions)}}
43+
<div class="small-4 columns menu-option">
44+
{{#link-to 'search_organisation' class="menu-list-anchor"}}
45+
<div class="menu-svg">{{fa-icon 'user-cog' size="lg"}}</div>
46+
<br>
47+
<div class="option-subtext">{{t 'manage_charity_users'}}</div>
48+
{{/link-to}}
49+
</div>
50+
</div>
51+
{{#if (is-or getCurrentUser.canManageStocktakes getCurrentUser.canManageStocktakeRevisions)}}
52+
<div class="row menu-margin">
4453
<div class="small-4 columns menu-option">
4554
{{#link-to 'stocktakes' class="menu-list-anchor"}}
4655
<div class="menu-svg">{{fa-icon 'list-ol' size="lg"}}</div>
4756
<br>
4857
<div class="option-subtext">{{t 'stocktakes.title'}}</div>
4958
{{/link-to}}
5059
</div>
51-
{{/if}}
52-
</div>
60+
</div>
61+
{{/if}}
5362
</div>
5463

5564
<div class="row">

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "stock",
3-
"version": "0.19.9",
3+
"version": "0.20.0",
44
"private": true,
55
"directories": {
66
"doc": "doc",

0 commit comments

Comments
 (0)