caseadilla 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b914dcdc7b9f58aa0b9c41ab59d63b5a369bd09
-  data.tar.gz: a63d9a71eb406b8977d39992b8ff3e0dacae3c23
+  metadata.gz: 3556d4b0a771c289c2ec6a5ebab357a3168072e0
+  data.tar.gz: 95baff80f5a592febf62a24d023fc1ed637dcf10
 SHA512:
-  metadata.gz: 9ff40348099a07a93080b9fbcbaead20a86764d457e61cfe785625d55c79ae9ce59f8c8f2ebb22a44d2b44334665d4d3f518b5947d9653fbaf0015574465d661
-  data.tar.gz: 4902c54098be556e28ae6f514f273311596f097e3da34f17899712843eca4d37b4a643a0227f9a5bece7ad56191fb2f16448f652905e8ebdd48b6dd8836f63f2
+  metadata.gz: c869bc1bfd6ede6a25b7ca3a9444f17e4041813b6fd1333c7d3d1cb248b97625b841aa818360c223187611b50857c6f0fd2e45ccb9e2de3c3a5c7a483bd2deed
+  data.tar.gz: e7a9b05fe061ff40f0a62500f09063abeaeb6ee01136bb9f6c40e6a118d3457c52fc59d3656e985918802f47a39252c2bf9a1e0d23293423780c639a7b9addcb

data/app/controllers/caseadilla/users_controller.rb

@@ -51,6 +51,12 @@ module Caseadilla
         return
       end
     end
+
+    # This action not related to update_password action
+    def change_password
+      @caseadilla_user = User.find params[:id]
+      @caseadilla_page_title = "#{@caseadilla_user.first_name} #{@caseadilla_user.last_name} > Change password"
+    end
  
     def update_password
       @caseadilla_user = User.find params[:id]
@@ -111,7 +117,7 @@ module Caseadilla
       end
 
       def caseadilla_user_params
-        params.require(:user).permit(:email, :first_name, :last_name, :time_zone, :role, :role_id, :password, :password_confirmation)
+        params.require(:user).permit(:email, :first_name, :last_name, :time_zone, :role, :role_id, :password, :password_confirmation, :current_password)
       end
  
   end

data/app/views/caseadilla/users/change_password.html.erb

@@ -0,0 +1,30 @@
+<h2>Change password for <%= @caseadilla_user.name.strip.empty? ? @caseadilla_user.email : @caseadilla_user.name %></h2>
+
+<%= simple_form_for(@caseadilla_user, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+
+  <div class="row">
+    <div class="col-lg-6">
+      <%= caseadilla_password_field f, f.object, :password, {caseadilla_label: "New password"} %>
+    </div>
+    <div class="col-lg-6">
+      <%= caseadilla_password_field f, f.object, :password_confirmation, {caseadilla_label: "Confirm password"} %>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-lg-6">
+      <%= caseadilla_password_field f, f.object, :current_password, {caseadilla_label: "Current password"} %>
+    </div>
+  </div>
+
+  <p class="submits">
+      <%= link_to 'Cancel', :back, :class => 'btn btn-mini btn-danger' %>
+    <%= f.submit "Save changes", :class => "btn btn-mini btn-primary" %>
+  </p>
+<% end %>
+
+<%= content_for :sidebar do %>
+  <% if current_user #.is_admin? %>
+      <li><%= link_to "#{caseadilla_show_icon('circle-arrow-left')}Back".html_safe, :back %></li>
+  <% end %>
+<% end %>

data/app/views/caseadilla/users/show.html.erb

@@ -35,5 +35,8 @@
 <%= content_for :sidebar do %>
   <% if current_user #.is_admin? %>
       <li><%= link_to "#{caseadilla_show_icon('th-list')}Back to list".html_safe, caseadilla_users_path %></li>
+      <% if current_user == @caseadilla_user %>        
+        <li><%= link_to "#{caseadilla_show_icon('pencil')}Change password".html_safe, change_password_caseadilla_user_path %></li>
+      <% end %>
   <% end %>
 <% end %>

data/config/routes.rb

@@ -6,9 +6,10 @@ Rails.application.routes.draw do
   
     if Caseadilla::Engine.flavor = :steak
       resources :users do
-        # member do
-        #   patch :update_password, :reset_password
-        # end
+        member do
+          get :change_password
+          # patch :update_password, :reset_password
+        end
       end
       resources :roles
       

data/lib/caseadilla/version.rb

@@ -1,3 +1,3 @@
 module Caseadilla
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/generators/caseadilla/install/install_generator.rb

@@ -105,7 +105,7 @@ module Caseadilla
         inject_into_file 'config/authorization_rules.rb', after: "authorization do\n" do <<-'RUBY'
 
   role :admin do
-    has_permission_on :caseadilla_users, to: :manage
+    has_permission_on :caseadilla_users, to: [:manage, :change_password]
     has_permission_on :caseadilla_roles, to: :manage
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caseadilla
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Xavier Bick
@@ -172,6 +172,7 @@ files:
 - app/views/caseadilla/roles/index.html.erb
 - app/views/caseadilla/roles/new.html.erb
 - app/views/caseadilla/roles/show.html.erb
+- app/views/caseadilla/users/change_password.html.erb
 - app/views/caseadilla/users/index.html.erb
 - app/views/caseadilla/users/new.html.erb
 - app/views/caseadilla/users/show.html.erb