summaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-11-26 14:32:50 +0100
committerAzul <azul@leap.se>2012-11-26 14:32:50 +0100
commitbf74255d1530fe5852dc6e6c27ef975ce9aa8d3c (patch)
tree1a46627f7376dc038fb025981cc9b96236c43908 /users
parent1ea7da1314a46a87512e4f3d7f99249883f4f12f (diff)
added admin menu and user index action
Diffstat (limited to 'users')
-rw-r--r--users/app/controllers/users_controller.rb5
-rw-r--r--users/app/views/sessions/_admin_nav.html.haml6
-rw-r--r--users/app/views/sessions/_nav.html.haml6
-rw-r--r--users/app/views/users/index.html.haml1
-rw-r--r--users/config/locales/en.yml6
5 files changed, 21 insertions, 3 deletions
diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
index 5be1fa9..4912ac8 100644
--- a/users/app/controllers/users_controller.rb
+++ b/users/app/controllers/users_controller.rb
@@ -3,9 +3,14 @@ class UsersController < ApplicationController
skip_before_filter :verify_authenticity_token, :only => [:create]
before_filter :fetch_user, :only => [:edit, :update]
+ before_filter :authorize_admin, :only => [:index]
respond_to :json, :html
+ def index
+ @users = User.all
+ end
+
def new
@user = User.new
end
diff --git a/users/app/views/sessions/_admin_nav.html.haml b/users/app/views/sessions/_admin_nav.html.haml
new file mode 100644
index 0000000..14dfbdc
--- /dev/null
+++ b/users/app/views/sessions/_admin_nav.html.haml
@@ -0,0 +1,6 @@
+%a#admin-menu{"data-toggle" => "dropdown", :role => :button}
+ Admin
+%ul.dropdown-menu{:role => "menu", "aria-labelledby" => "admin-menu"}
+ %li
+ = link_to Ticket.model_name.human(:count => ""), tickets_path, {:tabindex => -1}
+ = link_to User.model_name.human(:count => ""), users_path, {:tabindex => -1}
diff --git a/users/app/views/sessions/_nav.html.haml b/users/app/views/sessions/_nav.html.haml
index dab865e..5306d0e 100644
--- a/users/app/views/sessions/_nav.html.haml
+++ b/users/app/views/sessions/_nav.html.haml
@@ -1,11 +1,11 @@
- if logged_in?
+ - if admin?
+ %li.dropdown
+ = render 'sessions/admin_nav'
%li
= link_to current_user.login, edit_user_path(current_user)
%li
= link_to t(:logout), logout_path
- - if admin?
- %li
- = 'ADMIN' # obviously not like this
- else
%li
= link_to t(:login), login_path
diff --git a/users/app/views/users/index.html.haml b/users/app/views/users/index.html.haml
new file mode 100644
index 0000000..7db6038
--- /dev/null
+++ b/users/app/views/users/index.html.haml
@@ -0,0 +1 @@
+%h1= User.model_name.human(:count =>@users.count)
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml
index be3f28e..1260494 100644
--- a/users/config/locales/en.yml
+++ b/users/config/locales/en.yml
@@ -6,3 +6,9 @@ en:
login_message: "Please login with your account."
wrong_password: "wrong password"
user_not_found: "could not be found"
+
+ activemodel:
+ models:
+ user:
+ one: User
+ other: "%{count} Users"