Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/assets/stylesheets/admin.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
display: inline-block;
float: left;
margin: 12px 0;
width: 33%;
min-height: 80px;
width: 32%;
}
img {
height: 50px;
Expand All @@ -80,6 +81,9 @@
float: right;
margin-right: 60px;
}
a.wl-button {
margin: 5px auto 0;
}
}
.admin-table {
color: #333;
Expand Down
5 changes: 5 additions & 0 deletions app/controllers/admin_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ def user_update
head :ok
end

def delete_user
User.find(params[:id]).destroy
redirect_to :admin_users
end

def options
@results = Language.find(:all, :order => "title")
get_used_items(Language)
Expand Down
9 changes: 6 additions & 3 deletions app/models/user.rb
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
class User < ActiveRecord::Base
include ValidatesAsImage
before_save :calculate_fields
after_destroy :destroy_inactive_widgets

has_attached_file :avatar,
:styles => {
:thumb => ["50x50!", :png],
:medium => ["100x100!", :png],
:large => ["800x800", :png] },
:default_url => "register_default_image.jpg"
has_many :widgets
has_many :downloads
has_many :widgets, :dependent => :destroy
has_many :downloads, :dependent => :destroy

# Include default devise modules. Others available are:
# :token_authenticatable, :encryptable, :confirmable, :lockable,
Expand Down Expand Up @@ -62,5 +63,7 @@ def calculate_fields
self.name = "#{self.first_name} #{self.last_name}"
self.url_title = "#{self.first_name.to_s.downcase}-#{self.last_name.to_s.downcase}"
end

def destroy_inactive_widgets
Widget.where("user_id = ?", self.id).destroy_all
end
end
1 change: 1 addition & 0 deletions app/views/admin/_user.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<label class="label" for="chk_user_reviewer<%= user.id %>">Reviewer:</label>
<% if user_signed_in? && current_user.id != user.id %>
<%= check_box_tag "chk_user_reviewer#{user.id}", 1, user.reviewer %>
<%= link_to "Remove User", admin_delete_user_path(user), :confirm => "Are you sure you want to delete this user?", :class => "wl-button wl-overlay-button", :method => "delete" %>
<% else %>
<%= check_box_tag "chk_user_reviewer#{user.id}", 1, user.reviewer, :disabled => true %>
<% end %>
Expand Down
1 change: 1 addition & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
# Admin section
match '/admin/users' => 'admin#users', :as => :admin_users
match '/admin/users/admin' => 'admin#adminusers', :as => :admin_admin_users
delete '/admin/users/delete/:id' => 'admin#delete_user', :as => :admin_delete_user
match '/admin/options' => 'admin#options', :as => :admin_options
match '/admin/languages/edit/:id' => 'admin#edit_language', :as => :admin_edit_language
post '/admin/languages/save' => 'admin#save_language', :as => :admin_add_edit_language
Expand Down