easy_admin_ui 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 513d2dbb36980dd4af655db1099431b8350fe0cd
-  data.tar.gz: 159c898813aa7f1419f35519650d6e245d8270ee
+  metadata.gz: 30eea89e6040f709fd974b92c901c0c1aa8d54a5
+  data.tar.gz: 5dc3f627ef2df96049f4e1d034c194e959a07ee9
 SHA512:
-  metadata.gz: 8b279eb13d7789daa621311d82fe89dc926618976cc1aeb8293cb352ca5d4da0e7d334c2964bd3844911d608be3028813c03c516bd8aa3b9adbec618cf972287
-  data.tar.gz: aab2ba2305a650268e463da9bfd2d820657dddcab8e21ba66660296868e752a96f554608d02884c1fa18f36c2a82db0d7e8a67974a87518f85910330b7a0832d
+  metadata.gz: 10d9bdc9d479b7ddc40be58b95694ae6126a378bace121e4271f50014927fcff2a17e1bee484ede2ee0e12aa68d459a86639d8ded1e5c42fafb9e273fd6f40ca
+  data.tar.gz: 01a5a205d2e0a54a1f0b15043efacb9c4f53cdc5ba1af2cc4f2c73331f21288926588dd01b0b4d00eff95e7bff718a2a23b8cb74284eb3a3e062ae8f1e70bb3b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    easy_admin_ui (0.7.0)
+    easy_admin_ui (0.7.1)
       formtastic (>= 2.2.1)
       kaminari (>= 0.12.4)
       rails (>= 4.0.0)
@@ -48,9 +48,10 @@ GEM
     hike (1.2.3)
     httpclient (2.3.4.1)
     i18n (0.6.9)
-    kaminari (0.15.1)
+    kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)

data/app/assets/javascripts/easy_admin_ui/easy_admin_ui.js

@@ -0,0 +1,24 @@
+$(document).ready(function() {
+  var confirm_html = '\
+    <span id="confirm_delete_OBJID" class="admin_delete-confirm_delete" style="display: none;">\
+      Are you sure?\
+      <a href="DELETE_URL" data-id="OBJID" data-method="delete" data-remote="true">Yes</a> | <a href="" class="no">No</a>\
+    </span>';
+
+  $('body').on('click', '.admin_delete', function(e) {
+    e.preventDefault();
+
+    var a_link = $(e.target).parent('a')
+    var obj_id = a_link.attr('data-id')
+
+    a_link.after(confirm_html.replace(/OBJID/g, obj_id).replace(/DELETE_URL/, window.location + '/' + obj_id))
+
+    a_link.siblings('#confirm_delete_' + obj_id).show()
+  });
+
+  // User clicks No.
+  $('body').on('click', '.admin_delete-confirm_delete .no', function(e) {
+    $(e.target).parent('.admin_delete-confirm_delete').remove()
+    e.preventDefault()
+  });
+});

data/app/helpers/easy_admin_ui/easy_admin_ui_helper.rb

@@ -68,7 +68,7 @@ module EasyAdminUi
     end
 
     def admin_show_link(item, html_options = {})
-      link_to(image_tag("easy_admin_ui/show.png"), {:action => 'show', :id => item}.merge(html_options))
+      link_to(show_icon_image_tag, {:action => 'show', :id => item}.merge(html_options))
     end
 
     def admin_new_link(html_options = {})
@@ -76,7 +76,7 @@ module EasyAdminUi
     end
 
     def admin_edit_link(item, html_options = {})
-      link_to(image_tag("easy_admin_ui/pencil.png"), {:action => 'edit', :id => item}.merge(html_options))
+      link_to(edit_icon_image_tag, {:action => 'edit', :id => item}.merge(html_options))
     end
 
     # Use if below /admin/.
@@ -87,10 +87,7 @@ module EasyAdminUi
 
     def delete_link_with_confirmation(obj, delete_path=nil)
       delete_path ||= eval("#{obj.class.to_s.underscore.singularize}_path(obj)")
-      link_to_function(image_tag('easy_admin_ui/delete.png'), "$('#cnf_#{obj.id}').show();") + ' ' +
-        raw('<span id="cnf_' + obj.id.to_s + '" class="conf_link" style="display: none;">Are you sure? ') +
-        link_to("Yes", delete_path, :method => :delete, :remote => true) + ' ' +
-        link_to_function("No", "$('#cnf_#{obj.id}').hide();") + raw('</span>')
+      link_to(delete_icon_image_tag, '', class: "admin_delete", 'data-id' => obj.id.to_s)
     end
 
     def partial_exists?(filename)
@@ -100,7 +97,7 @@ module EasyAdminUi
     def filename_from_partial(partial)
       "_#{partial}.html.erb"
     end
-    
+
     # Render partial if it exists.
     def render_optional(partial)
       return '' unless partial_exists?(filename_from_partial(partial))
@@ -118,5 +115,17 @@ module EasyAdminUi
         end
       end.html_safe
     end
+
+    def show_icon_image_tag
+      image_tag("easy_admin_ui/show.png")
+    end
+
+    def edit_icon_image_tag
+      image_tag("easy_admin_ui/pencil.png")
+    end
+
+    def delete_icon_image_tag
+      image_tag('easy_admin_ui/delete.png')
+    end
   end
 end

data/lib/easy_admin_ui/core_ext.rb

@@ -95,11 +95,12 @@ module EasyAdminUi
 
         class_eval do
           def object_parameters
-            current_object
-            if @item.new_record?
+            if request.post?
               respond_to?(:allowed_params) ? allowed_params : create_params
-            else
+            elsif request.put?
               respond_to?(:allowed_params) ? allowed_params : update_params
+            else
+              {}
             end
           end
 
@@ -113,7 +114,7 @@ module EasyAdminUi
 
           def current_object
             @item ||= current_model.find(params[:id]) if params[:id]
-            @item ||= current_model.new(create_params)
+            @item ||= current_model.new(object_parameters)
           end
 
           def instance_variable_name

data/lib/easy_admin_ui/version.rb

@@ -1,3 +1,3 @@
 module EasyAdminUi
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/lib/resourceful/default/actions.rb

@@ -50,14 +50,14 @@ module Resourceful
       def update
         #load_object
         before :update
-        
+
         begin
           result = current_object.update_attributes object_parameters
         rescue ActiveRecord::StaleObjectError
           current_object.reload
           result = false
         end
-        
+
         if result
           save_succeeded!
           after :update

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_admin_ui
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Martin Moen Wulffeld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,6 +112,7 @@ files:
 - app/assets/images/easy_admin_ui/disconnect.png
 - app/assets/images/easy_admin_ui/pencil.png
 - app/assets/images/easy_admin_ui/show.png
+- app/assets/javascripts/easy_admin_ui/easy_admin_ui.js
 - app/assets/stylesheets/easy_admin_ui/easy_admin_ui.sass
 - app/helpers/easy_admin_ui/easy_admin_ui_helper.rb
 - app/views/easy_admin_ui/destroy.js.erb