Skip to content

Commit 7b57f80

Browse files
author
Tony Guntharp
committed
Merge pull request #108 from gabceb/CanCanAdmin
Added admin console. Added ability for admins approve, suspend and activate users
2 parents ad65897 + 4963b69 commit 7b57f80

40 files changed

+632
-108
lines changed

‎Gemfile

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ gem 'aws-sdk'
2121
gem 'paperclip'
2222
gem 'remotipart'
2323
gem 'jquery-rails'
24+
gem 'enumerize'
2425

2526
# Making the world a better, more stable place
2627
gem 'airbrake'
@@ -34,6 +35,7 @@ group :assets do
3435
gem 'execjs'
3536
gem 'eco'
3637
gem 'uglifier'
38+
gem 'bootstrap-sass', '~> 2.3.0.1'
3739
end
3840

3941
group :development do
@@ -42,6 +44,7 @@ group :development do
4244
gem 'awesome_print'
4345
gem 'better_errors'
4446
gem 'binding_of_caller'
47+
gem 'debugger'
4548
end
4649

4750
group :test do

‎Gemfile.lock

+15
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ GEM
5353
coderay (>= 1.0.0)
5454
erubis (>= 2.6.6)
5555
binding_of_caller (0.6.8)
56+
bootstrap-sass (2.3.0.1)
57+
sass (~> 3.2)
5658
bourbon (1.4.0)
5759
sass (>= 3.1)
5860
bourne (1.1.2)
@@ -74,9 +76,17 @@ GEM
7476
coffee-script-source
7577
execjs
7678
coffee-script-source (1.4.0)
79+
columnize (0.3.6)
7780
cookiejar (0.3.0)
7881
daemons (1.1.9)
7982
database_cleaner (0.9.1)
83+
debugger (1.2.3)
84+
columnize (>= 0.3.1)
85+
debugger-linecache (~> 1.1.1)
86+
debugger-ruby_core_source (~> 1.1.5)
87+
debugger-linecache (1.1.2)
88+
debugger-ruby_core_source (>= 1.1.1)
89+
debugger-ruby_core_source (1.1.6)
8090
devise (1.5.3)
8191
bcrypt-ruby (~> 3.0)
8292
orm_adapter (~> 0.0.3)
@@ -98,6 +108,8 @@ GEM
98108
http_parser.rb (>= 0.5.3)
99109
em-socksify (0.2.1)
100110
eventmachine (>= 1.0.0.beta.4)
111+
enumerize (0.5.1)
112+
activesupport (>= 3.2)
101113
erubis (2.7.0)
102114
eventmachine (1.0.0)
103115
execjs (1.4.0)
@@ -267,13 +279,16 @@ DEPENDENCIES
267279
aws-sdk
268280
better_errors
269281
binding_of_caller
282+
bootstrap-sass (~> 2.3.0.1)
270283
bourbon (~> 1.4.0)
271284
cloudfuji
272285
coffee-rails
273286
database_cleaner
287+
debugger
274288
devise
275289
devise_cloudfuji_authenticatable
276290
eco
291+
enumerize
277292
execjs
278293
factory_girl_rails
279294
faker

‎app/assets/images/emoticons/sad-meme.png

250 KB
Loading

‎app/assets/images/profile.png

1.3 KB
Loading

‎app/assets/javascripts/admin/admin.js.coffee

+112
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
SUSPEND_ACTION = "suspend"
2+
SUSPEND_BTN_CSS = "btn-danger"
3+
ACTIVATE_ACTION = "activate"
4+
ACTIVATE_APPROVE_BTN_CSS = "btn-success"
5+
APPROVE_ACTION = "approve"
6+
7+
$(document).ready ->
8+
$(document).on("click", ".waiting-for-approval-users .action.approve", {action : APPROVE_ACTION }, act_on_user)
9+
$(document).on("click", ".approved-users .action.suspend", {action : SUSPEND_ACTION }, act_on_user)
10+
$(document).on("click", ".approved-users .action.activate", {action : ACTIVATE_ACTION }, act_on_user)
11+
$(document).on("click", ".admin input[type='checkbox']", {}, toggelAdminOnUser)
12+
return
13+
14+
act_on_user = (obj)->
15+
$el = $(this)
16+
$row = $el.closest("tr")
17+
18+
user_id = $row.data("user-id")
19+
action_taken = obj.data.action
20+
21+
request = $.post '/admin/update_user',
22+
user_id: user_id
23+
action_taken: action_taken
24+
25+
request.success (data) ->
26+
# We will set the new and old css actions depending on the action that was taken because this method
27+
# is used by 3 different buttons
28+
if action_taken == SUSPEND_ACTION
29+
old_btn_class = SUSPEND_ACTION
30+
old_css_class = SUSPEND_BTN_CSS
31+
new_btn_class = ACTIVATE_APPROVE_BTN_CSS
32+
new_css_class = ACTIVATE_ACTION
33+
else
34+
# Approve and activate will be almost the same except for the original css class
35+
if action_taken == ACTIVATE_ACTION
36+
old_css_class = ACTIVATE_ACTION
37+
else
38+
old_css_class = APPROVE_ACTION
39+
40+
old_btn_class = ACTIVATE_APPROVE_BTN_CSS
41+
new_btn_class = SUSPEND_BTN_CSS
42+
new_css_class = SUSPEND_ACTION
43+
44+
btn_text = _.str.titleize(new_css_class)
45+
46+
$row.find("td.status").text(_.str.titleize(data.status))
47+
48+
# Change the look of the buttons by removing and adding classes
49+
$el.text(btn_text).removeClass("#{old_btn_class} #{old_css_class}").addClass("#{new_btn_class} #{new_css_class}")
50+
51+
# Check if the user was an approval. If so, move the user out of the waiting for approval table and add it to the approved table
52+
if action_taken == APPROVE_ACTION
53+
$row.remove()
54+
$(".approved-users table").show().append($row)
55+
56+
toggleTableIfNeeded $(".waiting-for-approval-users")
57+
toggleTableIfNeeded $(".approved-users")
58+
59+
# Show the admin row that is hidden on the waiting for approval users table
60+
$row.find("td.admin").show()
61+
62+
return
63+
64+
request.error (data, textStatus, jqXHR) ->
65+
alert('Something went wrong while trying to get change user status')
66+
67+
return
68+
69+
toggelAdminOnUser = ()->
70+
$el = $(this)
71+
$row = $el.closest("tr")
72+
73+
user_id = $row.data("user-id")
74+
75+
checked = $el.prop("checked");
76+
77+
full_name = $row.data("full-name")
78+
79+
# Generate the message based on the check of the user admin flag
80+
message = if checked then "make #{full_name} an administrator?" else "remove #{full_name} from the administrators?"
81+
message = "Are you sure " + message
82+
83+
# If the user didnt confirm then put the check back and return
84+
if(confirm(message) != true)
85+
$el.prop("checked", !checked);
86+
return
87+
88+
request = $.post '/admin/toggle_admin',
89+
user_id: user_id
90+
91+
request.success (data) ->
92+
alert("#{full_name} is now an administrator")
93+
return
94+
95+
request.error (data, textStatus, jqXHR) ->
96+
alert("Something went wrong while trying to make #{full_name} an administrator")
97+
$el.prop("checked", !checked);
98+
return
99+
100+
# Toggles a table and the container that says there are no users if needed
101+
toggleTableIfNeeded = ($container)->
102+
$table = $container.find("table")
103+
$no_user_el = $container.find(".js-no-users")
104+
105+
if $table.find("tbody tr").length == 0
106+
$table.hide()
107+
$no_user_el.show()
108+
else
109+
$table.show()
110+
$no_user_el.hide()
111+
112+
return

‎app/assets/javascripts/application.js

+1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
//= require lib/backbone
2020
//= require backbone/kandan
2121
//= require_tree .
22+
//= stub admin/admin
2223
//= require lib/jquery.atwho
2324
//= require lib/jquery.caret

‎app/assets/javascripts/backbone/kandan.js.coffee.erb

-16
Original file line numberDiff line numberDiff line change
@@ -125,29 +125,13 @@ window.Kandan =
125125
Kandan.Plugins.Mentions.initUsersMentions(Kandan.Helpers.ActiveUsers.all())
126126
return
127127

128-
setCurrentUser: ()->
129-
template = JST['current_user']
130-
currentUser = Kandan.Helpers.Users.currentUser()
131-
displayName = "#{currentUser.first_name} #{currentUser.last_name}" if currentUser.first_name?
132-
displayName ||= currentUser.email
133-
$(".header .user").html template({
134-
gravatarHash: currentUser.gravatar_hash,
135-
name: displayName
136-
})
137-
138128
registerUtilityEvents: ()->
139129
window.setInterval(=>
140130
for el in $(".posted_at")
141131
$(el).text (new Date($(el).data("timestamp"))).toRelativeTime(@options.nowThreshold)
142132
, @options.timestampRefreshInterval)
143133

144-
$(".user_menu_link").click (e)->
145-
e.preventDefault()
146-
$(".user_menu").toggle()
147-
false
148-
149134
init: ->
150-
@setCurrentUser()
151135
channels = new Kandan.Collections.Channels()
152136
channels.fetch({
153137
success: (channelsCollection)=>

‎app/assets/javascripts/layout.js.coffee

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
$(document).ready ->
2+
$(".user_menu_link").click (e)->
3+
e.preventDefault()
4+
$(".user_menu").toggle()
5+
false

‎app/assets/javascripts/pages.js.coffee

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Place all the behaviors and hooks related to the matching controller here.
2+
# All this logic will automatically be available in application.js.
3+
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

‎app/assets/stylesheets/_base.sass

+9-13
Original file line numberDiff line numberDiff line change
@@ -110,20 +110,16 @@ body
110110
float: right
111111
margin: -150px 320px 0 0
112112

113-
.about p,h1,h3,
114-
margin-left: auto
115-
margin-right: auto
116-
width: 600px
117-
118-
.about ul
119-
margin-left: auto
120-
margin-right: auto
121-
width: 600px
113+
.about
114+
p,h1,h3,ul,
115+
margin-left: auto
116+
margin-right: auto
117+
width: 600px
122118

123119
.devise
124120
padding-top: 20px
125121

126-
.devise p, .devise div,h1,h2,
127-
margin-left: auto
128-
margin-right: auto
129-
width: 600px
122+
p, div, h1, h2,
123+
margin-left: auto
124+
margin-right: auto
125+
width: 600px

‎app/assets/stylesheets/admin.css.sass

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
@import bootstrap
2+
3+
.admin-main-area
4+
input[type="number"]
5+
height: 30px !important
6+

‎app/assets/stylesheets/pages.css.scss

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// Place all the styles related to the Pages controller here.
2+
// They will automatically be included in application.css.
3+
// You can use Sass (SCSS) here: http://sass-lang.com/

‎app/controllers/admin/admin_controller.rb

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
module Admin
2+
class AdminController < BaseController
3+
4+
def index
5+
@settings = Setting.my_settings
6+
@all_users = User.find(:all, :conditions => ["id != ?", current_user.id])
7+
8+
@waiting_for_approval_users = []
9+
@approved_users = []
10+
11+
# Iterate over the array to get approved and non-approved users
12+
@all_users.each{|user| user.status.waiting_approval? ? @waiting_for_approval_users.push(user) : @approved_users.push(user) }
13+
end
14+
15+
def update
16+
17+
max_rooms = params[:setting][:max_rooms].to_i
18+
public_site = params[:setting][:public_site] == "1"
19+
20+
Setting.set_values(:max_rooms => max_rooms, :public_site => public_site)
21+
22+
redirect_to :admin_root
23+
end
24+
25+
def update_user
26+
user_id = params[:user_id]
27+
action = params[:action_taken].to_s
28+
29+
user = User.find(user_id)
30+
31+
case action
32+
when "activate", "approve"
33+
user.status = "active"
34+
when "suspend"
35+
user.status = "suspended"
36+
end
37+
38+
user.save! if user.changed?
39+
40+
render :json => user, :status => 200
41+
end
42+
43+
def toggle_admin
44+
user_id = params[:user_id]
45+
46+
user = User.find(user_id)
47+
48+
user.is_admin = !user.is_admin?
49+
50+
user.save!
51+
52+
render :json => user, :status => 200
53+
end
54+
55+
end
56+
end

‎app/controllers/admin/base_controller.rb

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
module Admin
2+
class BaseController < ApplicationController
3+
before_filter :authenticate_admin!
4+
5+
private
6+
7+
def authenticate_admin!
8+
redirect_to root_url unless current_user.try(:is_admin?)
9+
end
10+
11+
end
12+
end

‎app/controllers/application_controller.rb

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
11
class ApplicationController < ActionController::Base
22
protect_from_forgery
3+
4+
before_filter :force_approved_account
5+
before_filter :redirect_suspended_account
6+
7+
def force_approved_account
8+
# We will redirect to the approval page if a user is signed in, is not an admin and is marked as waiting for approval
9+
redirect = user_signed_in? && !current_user.is_admin? && current_user.status.waiting_approval?
10+
11+
redirect_to approval_path if redirect
12+
end
13+
14+
def redirect_suspended_account
15+
# We will redirect to suspended if a user is singed in and its marked as suspended
16+
redirect = user_signed_in? && current_user.status.suspended?
17+
18+
redirect_to suspended_path if redirect
19+
end
20+
321
end

‎app/controllers/pages_controller.rb

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
class PagesController < ApplicationController
2+
3+
before_filter :authenticate_user!, :except => :about
4+
5+
skip_filter :force_approved_account, :only => :approval
6+
skip_filter :redirect_suspended_account, :only => :suspended
7+
8+
def approval
9+
redirect_to(root_path) && return unless current_user.status.waiting_approval?
10+
end
11+
12+
def suspended
13+
redirect_to(root_path) && return unless current_user.status.suspended?
14+
end
15+
16+
def about
17+
end
18+
19+
end

‎app/controllers/sessions_controller.rb

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
class SessionsController < Devise::SessionsController
2+
skip_filter :force_approved_account
3+
skip_filter :redirect_suspended_account
4+
end

0 commit comments

Comments
 (0)