caboose-cms 0.3.26 → 0.3.27

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDNkYTYwNmRiNjA3ZWUwZTcwMjI2NGIxMzk1MjYyMzYwZTk2YjcwMw==
+    NDk0NDBiM2RjNGVlNTZmMjQwY2U1ZmQxODJhZGQ4ZjY2YjJiNzc1Zg==
   data.tar.gz: !binary |-
-    MjQ4NGYxOGUxZTRlMGNhODU0NDZiYTY5NDY0MzUyNzYzZWU3NDdkMg==
+    NmU3ZjVmMzgyNTk2MDA1Y2JjZWJjZmEwMDRlYWQxOWNhYWY0ZjBlOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTZlYTU4YTM0MmI2YjFhMTNjZmJkYWYzNDE5MWI5MGVmYjViNWI0OGNmNWZh
-    OGI2MGFjMzQ4NjlhOThiODVjNGM4ZjJlZGZkMjc0ZjA4YzE1OTc3YzcyZDQz
-    NTNkNjY1NmViMTY0MTUxNjkwZmUzYjI0MTQ4YmQzYzFlYWVmMmM=
+    OTZjMzVkMWUwNDY2ZGQzMmEzOTg3MjZlNzBhN2JkNmQzNTc5ZTA5ZjY5MmJk
+    ZDk1NzRmNWJmMGM0Y2VmNzg1Y2Y2NTAwZmE0YTUxZjhmNDIxNTQ0MmVlOTA1
+    MzUzZDYxMmYxOGI2YjdmMDMwZTMxNjUxZTU4MDdlMGE2NTNkNzY=
   data.tar.gz: !binary |-
-    OTA0ZmM4Nzc0OGE0ZjJkNmQxNjY1NTVjNGVhNjc2OTY0NDVjNTE2Y2U0YWFh
-    ZTA2ODA2Y2FmZmVhNDc0ZTM1ZmUwMDI5MTZjNmM1OTM0YjUzMmM5NzZkYmE4
-    MGM4ZWUwYjgwNjVhMjk5NzgyZDgwYTRkOGJlMmJjYmZjNjRmNzc=
+    ZTdiOWFhNTQ2MTMyNDRlZmVhOTFjZWM3M2I0MTE3NDMwZGE3NTMwYTFjZTk0
+    MTkyMWJiZGM4MWI1ZTJlYzI3MWQ5ZTA0MWRjYmI4YzRkMTNlY2U4YzlmMjg5
+    NWM0MjAwMjNkNmUyN2I3OTY0NTgyNDgxMDU4MjE3ODkwMWI3NmE=

data/app/controllers/caboose/users_controller.rb

@@ -124,7 +124,7 @@ module Caboose
     	  	when "first_name", "last_name", "username", "email"
     	  	  user[name.to_sym] = value
     	  	when "password"			  
-    	  	  confirm = params[:confirm]
+    	  	  confirm = params[:password2]
     	  		if (value != confirm)			
     	  		  resp.error = "Passwords do not match.";
     	  		  save = false

data/app/views/caboose/users/edit_password.html.erb

@@ -1,34 +1,31 @@
 
 <h1>Reset Password for <%= "#{@edituser.first_name} #{@edituser.last_name}" %></h1>
+<form action='/admin/users/<%= @edituser.id %>' method='put' id='password_form'>
+<input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>' />
 <p><input type='password' name='password'   id='password'   value="" placeholder='Password' /></p>
 <p><input type='password' name='password2'  id='password2'  value="" placeholder='Confirm password' /></p>
 <div id='message'></div>
-<div id='controls'>
+<p>
 <input type='button' value='Back' onclick="window.location='/admin/users/<%= @edituser.id %>/edit';" />
-<input type='button' value='Update Password' onclick="updatePassword();" />
-</div>
+<input type='button' value='Update Password' onclick="update_password();" />
+</p>
 
 <% content_for :caboose_js do %>
 <script type="text/javascript">
-var modal = false;
-$(document).ready(function() {
-  modal = new CabooseModal(500);
-});
 
-function updatePassword()
+function update_password()
 {
   $.ajax({
-    url: '/admin/users/update-password',
-    type: 'post',
+    url: '/admin/users/<%= @edituser.id %>',
+    type: 'put',
+    data: $('#password_form').serialize(), 
     success: function(resp) {
-      if (resp.success)
-        modal.autosize("<p class='note success'>" + resp.success + "</p>");
-      if (resp.error)
-        modal.autosize("<p class='note success'>" + resp.error + "</p>");
-      if (resp.redirect)
-        window.location = resp.redirect;
+      if (resp.success)   $('#message').html("<p class='note success'>The password has been reset.</p>");
+      if (resp.error)     $('#message').html("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect)  window.location = resp.redirect;
     }
   });
 }
+
 </script>
 <% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.26'
+  VERSION = '0.3.27'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.26
+  version: 0.3.27
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails