caboose-cms 0.3.84 → 0.3.85

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWJiZWRlZmYyMGNmYWQyMjYzZmFiNTNlYmQ1NjZmMTQ2ZWE0MzViOA==
+    NDU1MDBlNzlkMzA1OTAyYTUzZGZmM2QwNGU3ZTg3ZTlkZWJjZTJiZg==
   data.tar.gz: !binary |-
-    NTZmODM1MDhlYWU1YzgxM2M1YTZhMjM2MDFkZGZlYjg5OTc0MGMyMA==
+    YWE0MzMyMWRiZWUwZWNkOWEzNmEzMzMyNzExYjlmMTVmZmEwYWVjNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Yjg2ODRkZTc1MjFiNDZjZGVjOTE3NTYwMzViNmU4NGEyYjJjMzFhZmVjZjMz
-    YmNmZjUzMzA3ZDYzNjE5MzI0Y2YwZjA0MmQzNzA3N2RlYzE2NWY5MDM1NGY5
-    MTI0NmUzZTllZDNhNmIzNjM2ODZjOWJhN2M3ZWE2MTQ4NjQzNjE=
+    YzdiMjZhOTY4MTE4NzI3OTE5YTQyY2FkY2NmODEwNjZiYTJhZjgzNDg1Mjhm
+    MmM2NWViNDRmZWVmOGJmODEyYmU0NDk5MDM1MDNiY2ZiNTM2MjVhNTVhZmVh
+    ZWRhNjVhNDZmZjVkZmM0Mjc2Nzc3MDYwMDZiMGJiNDZlYjU4NWI=
   data.tar.gz: !binary |-
-    N2JkMGU1YjMxMWU5MGE4YjY3NmFhNmZmOTAwYTkwYjEyMDllNDBlZjZhZGVm
-    MWExNjVlM2MwNTFjOGFiZTlhYzRmMDFlOWMzZWI1MTRhNjQ4ZjdjNWZkNzZm
-    ZTMwN2NlNGYxMmI0Yjg5MDNmZDhjODRjMzNiYTc3NzAzMzAyYjU=
+    ODZkODRjMWYxNDNmNTVjODY5Y2E3ZThmNjBhZjliNDhlNWEzNjJhMThmYjkx
+    ZGM5YWNhNmExN2IzOGY1YTEwZTRhNDQ0ZTRlMjI4ZmE5YzQ2MTJkOWNjMjhh
+    NjQzZGJlZjlkZjNjMTgwZGRhMjY2NWZkMGNhMjM2OGE2NGVjNTQ=

data/app/controllers/caboose/users_controller.rb

@@ -171,7 +171,7 @@ module Caboose
       resp = StdClass.new({
         'redirect' => '/admin/users'
       })
-      render json: resp
+      render :json => resp
     end
     
     # GET /admin/users/options

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

@@ -12,7 +12,7 @@ pic = "http://gravatar.com/avatar/#{gravatar_id}.png?s=150" #&d=/assets/caboose/
 <div id='controls'>
 <input type='button' value='Back'           onclick="window.location='/admin/users';" />
 <input type='button' value='Reset Password' onclick="window.location='/admin/users/<%= @edituser.id %>/edit-password';" />
-<input type='button' value='Delete User'    onclick="deleteUser();" />
+<input type='button' value='Delete User'    onclick="delete_user(<%= @edituser.id %>);" />
 </div>
 
 <% content_for :caboose_js do %>
@@ -38,6 +38,29 @@ $(document).ready(function() {
     on_load: function() { modal.autosize(); }
   });  
 });
+
+function delete_user(user_id, confirm)
+{
+  if (!confirm)
+  {
+    var p = $('<p/>').addClass('note confirm')
+      .append('Are you sure you want to delete the user? ')
+      .append($('<input/>').attr('type','button').val('Yes').click(function() { delete_user(user_id, true); })).append(' ')
+      .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); }));
+    $('#message').empty().append(p);
+    return;
+  }
+  $('#message').html("<p class='loading'>Deleting user...</p>");
+  $.ajax({
+    url: '/admin/users/' + user_id,
+    type: 'delete',
+    success: function(resp) {
+      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.84'
+  VERSION = '0.3.85'
 end

metadata

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