active_scaffold-sequel 0.7.0 → 0.7.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 215d2fdcd862770261b68026cc22652929cb9cba
+  data.tar.gz: 226549b5e7ed054a97522f447bfbd54cf4e4a700
+SHA512:
+  metadata.gz: 78d94becc4ec7f41951fe13b99f74c3755ee4e402999c935c63c5500fd8f70d4803d0eb6cc3e7563924138a5a1a0027a6ccc4ed5b8dfe939074bbd365c7b8bec
+  data.tar.gz: 76a398b2f428ce810598d59de9e2a448c3afd333bcfff7a331355720be1505a21a5aff887f4bf61a0ea246ac9e78f1866776fd1246f9c7958692bed420cc5dd7

data/frontends/default/views/on_update.js.erb

@@ -1,19 +1,25 @@
 try {
 <% form_selector = "#{element_form_id(:action => :update)}" %>
-var action_link = ActiveScaffold.find_action_link('<%= form_selector%>');
-action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'messages'))%>');
-<% if controller.send :successful? %>
-  <% if update_refresh_list? %>
-    ActiveScaffold.replace_html('<%= active_scaffold_content_id%>', '<%= escape_javascript(render(:partial => 'list', :layout => false))%>');
-   <% else %>
-    <% updated_row = render :partial => 'list_record', :locals => {:record => @record}%>
-    action_link.close('<%= escape_javascript(updated_row)%>');
-    <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
-      ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
+var action_link = ActiveScaffold.find_action_link('<%= form_selector %>');
+action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'messages')) %>');
+<% if controller.send(:successful?) %>
+  <% if render_parent? %>
+    <% if nested_singular_association? || render_parent_action == :row %>
+      action_link.close();
+    <% else %>
+      ActiveScaffold.reload('<%= url_for(render_parent_options) %>');
+    <% end %>
+  <% elsif update_refresh_list? %>
+    ActiveScaffold.replace_html('<%= active_scaffold_content_id %>', '<%= escape_javascript(render(:partial => 'list', :layout => false)) %>');
+  <% else %>
+    <% updated_row = render(:partial => 'list_record', :locals => {:record => @record}) %>
+    action_link.close('<%= escape_javascript(updated_row) %>');
+    <% if active_scaffold_config.list.columns.any? {|c| c.calculation?} %>
+      ActiveScaffold.replace('<%= active_scaffold_calculations_id %>', '<%= escape_javascript(render(:partial => 'list_calculations')) %>');
     <% end %>
   <% end %>
 <% else %>
-  ActiveScaffold.replace('<%=form_selector%>','<%=escape_javascript(render(:partial => 'update_form', :locals => {:xhr => true}))%>');
-  ActiveScaffold.scroll_to('<%=form_selector%>');
+  ActiveScaffold.replace('<%= form_selector %>','<%= escape_javascript(render(:partial => 'update_form', :locals => {:xhr => true})) %>');
+  ActiveScaffold.scroll_to('<%= form_selector %>');
 <% end %>
 } catch (e) { alert('RJS error:\n\n' + e.toString());}

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 0
     MINOR = 7
-    PATCH = 0
+    PATCH = 1
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold-sequel
 version: !ruby/object:Gem::Version
-  version: 0.7.0
-  prerelease: 
+  version: 0.7.1
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,49 +41,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rcov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.3
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: The original ActiveScaffold supports Rails (http://rubyonrails.org/)
@@ -397,27 +386,26 @@ files:
 homepage: http://as-seq.rubyforge.org/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveScaffold version supporting Sequel with Rails 3.1.
 test_files:
 - test/bridges/paperclip_test.rb