summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-16 22:17:06 +0100
committerJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-16 22:17:06 +0100
commitb8294f3ada89a6e26bf511455d80f2626a2fc09d (patch)
treeb9a14db3c3ea0b0a0d7a94e2cd2b5e354453b851 /app/views
parentf115c3541a42e408e32ebd30603125d796113a79 (diff)
parent79a822450f29086c31b26b3500d607f4461488f9 (diff)
Merge branch 'develop' of https://github.com/amooma/GS5 into develop
Diffstat (limited to 'app/views')
-rw-r--r--app/views/users/_user_groups.html.haml1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/views/users/_user_groups.html.haml b/app/views/users/_user_groups.html.haml
index 7e206b6..81191ae 100644
--- a/app/views/users/_user_groups.html.haml
+++ b/app/views/users/_user_groups.html.haml
@@ -5,4 +5,3 @@
%h2=t("user_groups.index.page_title")
- if user.user_groups.count > 0
= render "user_groups/index_core", :user_groups => user.user_groups.where(:tenant_id => tenant.id).order(:name)
- = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => UserGroup} \ No newline at end of file