Username: #{user.username}
Total Hours Worked: #{user.total_hours}
Hours worked in #{Time.now.strftime('%B')}: #{user.current_month_hours}
Current bike Shop ID: #{bike.shop_id if bike}
diff --git a/app/components/users.rb b/app/components/users.rb index 846b5fa..4a32613 100644 --- a/app/components/users.rb +++ b/app/components/users.rb @@ -1,16 +1,28 @@ class Users < Netzke::Basepack::Grid + include Netzke::Basepack::ActionColumn + + column :reset do |c| + c.type = :action + c.actions = [{name: :reset_password, icon: :lock_break}] + c.header = "" + c.width = 20 + end + def configure(c) super c.header = false c.model = "User" c.columns = [ + :username, :first_name, :last_name, :nickname, :email, :bike__shop_id ] + + c.columns << :reset if can? :manage, User end #override with nil to remove actions diff --git a/app/components/users/javascripts/init_component.js b/app/components/users/javascripts/init_component.js index d330667..de240a6 100644 --- a/app/components/users/javascripts/init_component.js +++ b/app/components/users/javascripts/init_component.js @@ -4,8 +4,32 @@ this.callParent(); this.getView().on('itemclick', function(view, record){ // The beauty of using Ext.Direct: calling 3 endpoints in a row, which results in a single call to the server! - console.log("user: " + record.get('id') ); this.selectCustomer({customer_id: record.get('id'), customer_type: 'User'}); }, this); + }, + onResetPassword: function(record){ + user = record.data; + Ext.Msg.confirm( + "Reset Password", + "Are you sure you want to reset "+user.first_name+" "+user.last_name+"'s password?", + function(butt_id){ + if( butt_id === "yes" ){ + $.ajax({ + type: 'POST', + url: '/api/v1/reset', + dataType: 'json', + contentType: 'application/json', + processData: false, + data: JSON.stringify({"user_id": user.id}), + complete: function() { }, + success: function(data) { + Ext.Msg.alert("Success", "New Password: "+data.password); + }, + error: function(data,textStatus) { + Ext.Msg.alert( "Error", JSON.parse(data.responseText)["error"]); + } + }); + } + }); } } diff --git a/app/components/users_and_profiles_border.rb b/app/components/users_and_profiles_border.rb index e91cb5a..afb31b4 100644 --- a/app/components/users_and_profiles_border.rb +++ b/app/components/users_and_profiles_border.rb @@ -9,7 +9,7 @@ class UsersAndProfilesBorder < Netzke::Base super c.header = false c.items = [ - { netzke_component: :users, header: "Users", region: :center, width: 300, split: true }, + { netzke_component: :users, header: "Users", region: :center, width: 350, split: true }, { netzke_component: :user_profiles, region: :south, height: 150, split: true}, { netzke_component: :user_logs, region: :east, split: true} ] @@ -25,5 +25,5 @@ class UsersAndProfilesBorder < Netzke::Base # store selected boss id in the session for this component's instance session[:selected_user_id] = params[:user_id] end - + end diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb new file mode 100644 index 0000000..35176bd --- /dev/null +++ b/app/controllers/api/v1/users_controller.rb @@ -0,0 +1,28 @@ +require 'securerandom' +class Api::V1::UsersController < Api::V1::BaseController + + def password_reset + if can? :manage, User + user = User.find_by_id(params[:user_id]) + render :json => { "error" => "User not found"}, :status => 404 and return if user.nil? + render :json => { "error" => "Not allowed to reset your own password in this fashion."}, :status => 403 and return if user.id == current_user.id + + new_pass = SecureRandom.hex[0,8] + user.password = new_pass + user.save + render :json => { "password" => new_pass}, :status => 200 and return + else + render :json => { "error" => "You do not have the permission"}, :status => 403 and return + end + end + + def checkout + #must use @current_user since user may not have signed in + if !@current_user.checked_in? + render :json => { "error" => "You were not even checked in."}, :status => 404 and return + else + @current_user.checkout + render :nothing => true, :status => 204 and return + end + end +end diff --git a/app/helpers/devise_helper.rb b/app/helpers/devise_helper.rb new file mode 100644 index 0000000..e672d5b --- /dev/null +++ b/app/helpers/devise_helper.rb @@ -0,0 +1,23 @@ +module DeviseHelper + # A simple way to show error messages for the current devise resource. If you need + # to customize this method, you can either overwrite it in your application helpers or + # copy the views to your application. + # + # This method is intended to stay simple and it is unlikely that we are going to change + # it to add more behavior or options. + def devise_error_messages! + return "" if resource.errors.empty? + + messages = resource.errors.full_messages.map { |msg| content_tag(:p, msg, :class => "alert") }.join + sentence = I18n.t("errors.messages.not_saved", + :count => resource.errors.count, + :resource => resource.class.model_name.human.downcase) + + html = <<-HTML +#{sentence}
+ #{messages} + HTML + + html.html_safe + end +end diff --git a/app/models/user.rb b/app/models/user.rb index 888c85e..338afd5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -8,7 +8,7 @@ class User < ActiveRecord::Base # Setup accessible (or protected) attributes for your model attr_accessible :email, :password, :password_confirmation, :remember_me, :first_name, :last_name, :nickname, :bike_id, - :user_profiles_attributes + :user_profiles_attributes, :username has_many :transactions has_many :user_profiles @@ -26,6 +26,10 @@ class User < ActiveRecord::Base "#{first_name} #{last_name}" end + def email_required? + false + end + def full_name to_s end diff --git a/app/models/user_profile.rb b/app/models/user_profile.rb index a9a569c..7c1cf32 100644 --- a/app/models/user_profile.rb +++ b/app/models/user_profile.rb @@ -1,16 +1,15 @@ class UserProfile < ActiveRecord::Base - # Setup accessible (or protected) attributes for your model attr_accessible :user_id, :addrStreet1, :addrStreet2, :addrCity, :addrState, :addrZip, :phone - + belongs_to :user belongs_to :bike - #validates :addrStreet1 , :presence => true - #validates :addrCity , :presence => true - #validates :addrState , :presence => true - #validates :addrZip , :presence => true - validates :phone, :presence => true + #validates :addrStreet1 , :presence => true + #validates :addrCity , :presence => true + #validates :addrState , :presence => true + #validates :addrZip , :presence => true + #validates :phone, :presence => true def to_s [addrStreet1, addrStreet2, addrCity, addrState, addrZip, phone].join(" - ") diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index bb66fbf..e2e50f8 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -1,3 +1,5 @@ +<%= stylesheet_link_tag "bootstrap_and_overrides", :media => "all" %> +