active_scaffold 3.1.6 → 3.1.7

data/app/assets/javascripts/jquery/active_scaffold.js

@@ -503,9 +503,15 @@ var ActiveScaffold = {
     record = $(record);
     var errors = record.prev();
     if (errors.hasClass('association-record-errors')) {
-      this.replace_html(errors, '');
+      this.remove(errors);
     }
+    var associated = $(record).next();
     this.remove(record);
+    while (associated.hasClass('associated-record')) {
+      record = associated;
+      associated = $(record).next();
+      this.remove(record);
+    }
   },
 
   report_500_response: function(active_scaffold_id) {

data/app/assets/javascripts/jquery/active_scaffold.js~

@@ -503,9 +503,15 @@ var ActiveScaffold = {
     record = $(record);
     var errors = record.prev();
     if (errors.hasClass('association-record-errors')) {
-      this.replace_html(errors, '');
+      this.remove(errors);
     }
+    var associated = $(record).next();
     this.remove(record);
+    while (associated && associated.hasClassName('associated-record')) {
+      record = associated;
+      associated = $(record).next();
+      this.remove(record);
+    }
   },
 
   report_500_response: function(active_scaffold_id) {
@@ -765,7 +771,7 @@ var ActiveScaffold = {
   },
   
   draggable_lists: function(element) {
-    $(element).draggable_lists();
+    $('#' + element).draggable_lists();
   }
 }
 

data/app/assets/javascripts/prototype/active_scaffold.js

@@ -456,9 +456,15 @@ var ActiveScaffold = {
   delete_subform_record: function(record) {
     var errors = $(record).previous();
     if (errors.hasClassName('association-record-errors')) {
-      this.replace_html(errors, '');
+      this.remove(errors);
     }
+    var associated = $(record).next();
     this.remove(record);
+    while (associated && associated.hasClassName('associated-record')) {
+      record = associated;
+      associated = $(record).next();
+      this.remove(record);
+    }
   },
 
   report_500_response: function(active_scaffold_id) {

data/app/assets/javascripts/prototype/active_scaffold.js~

@@ -456,7 +456,7 @@ var ActiveScaffold = {
   delete_subform_record: function(record) {
     var errors = $(record).previous();
     if (errors.hasClassName('association-record-errors')) {
-      this.replace_html(errors, '');
+      this.remove(errors);
     }
     this.remove(record);
   },
@@ -626,6 +626,10 @@ var ActiveScaffold = {
         }
       }
     });
+  },
+  
+  draggable_lists: function(element) {
+    new DraggableLists(element);
   }
 }
 

data/config/locales/ru.yml

@@ -84,8 +84,8 @@ ru:
     this_year: 'В этом году'
     prev_year: 'В прошлом году'
     next_year: 'В следующем году'
-    past: 'Прошлое'
-    future: 'Будущее'
+    past: 'Прошедшие'
+    future: 'Будущие'
     range: 'Интервал'
     seconds: 'секунд'
     minutes: 'минут'
@@ -102,10 +102,9 @@ ru:
       firstDay: 1
       isRTL: false
       showMonthAfterYear: false
+      
     datetime_picker_options:
-      timeText: 'Время'
-      currentText: 'Сегодня'
-      closeText: 'Закрыть'
+      
     errors:
       template:
         header:
@@ -117,6 +116,8 @@ ru:
 
     # error_messages
     cant_destroy_record: 'Запись %{record} не может быть удалена'
-    failed_to_save_record: 'Запись  не может быть сохранена из-за неизвестной ошибки'
     internal_error: '500 Внутренняя ошибка сервера'
     version_inconsistency: 'Эта запись была обновлена с того момента, как вы начали ее редактировать'
+    record_not_saved: 'Запись  не может быть сохранена из-за неизвестной ошибки'
+    no_authorization_for_action: 'Нет прав на выполнение действия "%{action}"'
+

data/frontends/default/views/_list_with_header.html.erb

@@ -5,6 +5,7 @@
   <table cellpadding="0" cellspacing="0">
     <tbody class="before-header" id="<%= before_header_id -%>">
       <% if active_scaffold_config.list.always_show_search %>
+      <% old_record, @record = @record, new_model %>
         <tr>
           <td>
             <div class="active-scaffold show_search-view <%= "#{params[:controller]}-view" %> view">
@@ -12,10 +13,12 @@
             </div> 
           </td> 
         </tr>
+      <% @record = old_record %>
       <% else %>
       <tr><td></td></tr>
       <% end %>
       <% if !nested? && active_scaffold_config.list.always_show_create %>
+      <% old_record, @record = @record, new_model %>
         <tr> 
           <td> 
             <div  class="active-scaffold create-view <%= "#{params[:controller]}-view" %> view">
@@ -23,6 +26,7 @@
             </div> 
           </td> 
         </tr>
+      <% @record = old_record %>
       <% end %>
     </tbody>
   </table>

data/frontends/default/views/_list_with_header.html.erb~

@@ -0,0 +1,32 @@
+<div id="<%= active_scaffold_id -%>" class="<%= as_main_div_class %>" <%= "data-eid=#{id_from_controller(params[:eid])}" if params[:eid]%>>
+  <div class="active-scaffold-header">
+    <%= render :partial => 'list_header' %>
+  </div>
+  <table cellpadding="0" cellspacing="0">
+    <tbody class="before-header" id="<%= before_header_id -%>">
+      <% if active_scaffold_config.list.always_show_search %>
+        <tr>
+          <td>
+            <div class="active-scaffold show_search-view <%= "#{params[:controller]}-view" %> view">
+              <%= render :partial => active_scaffold_config.list.search_partial %>
+            </div> 
+          </td> 
+        </tr>
+      <% else %>
+      <tr><td></td></tr>
+      <% end %>
+      <% if !nested? && active_scaffold_config.list.always_show_create %>
+        <tr> 
+          <td> 
+            <div  class="active-scaffold create-view <%= "#{params[:controller]}-view" %> view">
+              <%= render :partial => 'create_form_on_list' %>
+            </div> 
+          </td> 
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+  <div id="<%= active_scaffold_content_id-%>" class="as_content">
+    <%= render :partial => 'list' %>
+  </div>
+</div>

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

@@ -16,9 +16,11 @@ action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'mess
       <% end %>
       action_link.close();
     <% end %>
-    <%#page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
+    <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
+      ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
+    <% end %>
   <% elsif (active_scaffold_config.create.refresh_list) %>
-    ActiveScaffold.replace_html(<%= active_scaffold_content_id%>, <%= escape_javascript(render(:partial => 'list', :layout => false)) %>);
+    ActiveScaffold.replace_html('<%= active_scaffold_content_id%>', '<%= escape_javascript(render(:partial => 'list', :layout => false)) %>');
   <% elsif params[:parent_controller].nil? %>
     <% new_row = render :partial => 'list_record', :locals => {:record => @record} %>
     ActiveScaffold.create_record_row(action_link.scaffold(),'<%=escape_javascript(new_row)%>', <%={:insert_at => insert_at}.to_json.html_safe%>);

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

@@ -1,14 +1,14 @@
-<% column_span_id ||= element_cell_id(:id => @record.id.to_s, :action => 'update_column', :name => params[:column])%>
+<% @column_span_id ||= element_cell_id(:id => @record.id.to_s, :action => 'update_column', :name => params[:column]) %>
 <% unless controller.send :successful?%>
   alert('<%= escape_javascript(@record.errors.full_messages.join("\n"))%>');
   <% @record.reload%>
 <% end%>
 <% column = active_scaffold_config.columns[params[:column]]%>
 <% if column.inplace_edit%>
-  ActiveScaffold.replace_html('<%=column_span_id%>','<%=escape_javascript(format_inplace_edit_column(@record, column))%>');
+  ActiveScaffold.replace_html('<%=@column_span_id%>','<%=escape_javascript(format_inplace_edit_column(@record, column))%>');
 <% else%>
   <% formatted_value = get_column_value(@record, column)%>
-  ActiveScaffold.replace_html('<%=column_span_id%>','<%=escape_javascript(formatted_value)%>');
+  ActiveScaffold.replace_html('<%=@column_span_id%>','<%=escape_javascript(formatted_value)%>');
 <% end%>
 <% if column.calculation?%>
  ActiveScaffold.replace_html('<%=active_scaffold_calculations_id(column)%>', '<%=escape_javascript(render_column_calculation(column))%>');

data/frontends/default/views/update_column.js.erb~

@@ -0,0 +1,16 @@
+<% @column_span_id ||= element_cell_id(:id => @record.id.to_s, :action => 'update_column', :name => params[:column]) %>
+<% unless controller.send :successful?%>
+  alert('<%= escape_javascript(@record.errors.full_messages.join("\n"))%>');
+  <% @record.reload%>
+<% end%>
+<% column = active_scaffold_config.columns[params[:column]]%>
+<% if column.inplace_edit%>
+  ActiveScaffold.replace_html('<%=column_span_id%>','<%=escape_javascript(format_inplace_edit_column(@record, column))%>');
+<% else%>
+  <% formatted_value = get_column_value(@record, column)%>
+  ActiveScaffold.replace_html('<%=column_span_id%>','<%=escape_javascript(formatted_value)%>');
+<% end%>
+<% if column.calculation?%>
+ ActiveScaffold.replace_html('<%=active_scaffold_calculations_id(column)%>', '<%=escape_javascript(render_column_calculation(column))%>');
+<% end%>
+

data/lib/active_scaffold/actions/list.rb

@@ -17,8 +17,6 @@ module ActiveScaffold::Actions
 
     def list
       do_list
-      do_new if active_scaffold_config.list.always_show_create
-      @record ||= new_model if active_scaffold_config.list.always_show_search
       @nested_auto_open = active_scaffold_config.list.nested_auto_open
       respond_to_action(:list)
     end

data/lib/active_scaffold/actions/list.rb~

@@ -175,7 +175,9 @@ module ActiveScaffold::Actions
     end
     alias_method :index_formats, :list_formats
 
-    alias_method :row_formats, :list_formats
+    def row_formats
+      ([:html] + active_scaffold_config.formats + active_scaffold_config.list.formats).uniq
+    end
 
     def action_update_formats
       (default_formats + active_scaffold_config.formats).uniq

data/lib/active_scaffold/actions/update.rb

@@ -18,7 +18,7 @@ module ActiveScaffold::Actions
     # for inline (inlist) editing
     def update_column
       do_update_column
-      render :action => 'update_column', :locals => {:column_span_id => params[:editor_id] || params[:editorId]}
+      @column_span_id = params[:editor_id] || params[:editorId]
     end
 
     protected

data/lib/active_scaffold/actions/update.rb~

@@ -82,7 +82,6 @@ module ActiveScaffold::Actions
           @record = update_record_from_params(@record, active_scaffold_config.update.columns, params[:record]) unless options[:no_record_param_update]
           before_update_save(@record)
           self.successful = [@record.valid?, @record.associated_valid?].all? {|v| v == true} # this syntax avoids a short-circuit
-          debugger
           if successful?
             @record.save! and @record.save_associated!
             after_update_save(@record)

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -275,11 +275,13 @@ module ActiveScaffold
 
       def inplace_edit_control(column)
         if inplace_edit?(active_scaffold_config.model, column) and inplace_edit_cloning?(column)
-          @record = new_model
+          old_record, @record = @record, new_model
           column = column.clone
           column.options = column.options.clone
           column.form_ui = :select if (column.association && column.form_ui.nil?)
-          content_tag(:div, active_scaffold_input_for(column), {:style => "display:none;", :class => inplace_edit_control_css_class})
+          content_tag(:div, active_scaffold_input_for(column), :style => "display:none;", :class => inplace_edit_control_css_class).tap do
+            @record = old_record
+          end
         end
       end
 

data/lib/active_scaffold/helpers/list_column_helpers.rb~

@@ -84,7 +84,7 @@ module ActiveScaffold
           link.action = 'index'
           link.crud_type = :read
         end
-        link if link.crud_type.present?
+        link if link.action.present?
       end
 
       def column_link_authorized?(link, column, record, associated)
@@ -275,11 +275,13 @@ module ActiveScaffold
 
       def inplace_edit_control(column)
         if inplace_edit?(active_scaffold_config.model, column) and inplace_edit_cloning?(column)
-          @record = new_model
+          old_record, @record = @record, new_model
           column = column.clone
           column.options = column.options.clone
           column.form_ui = :select if (column.association && column.form_ui.nil?)
-          content_tag(:div, active_scaffold_input_for(column), {:style => "display:none;", :class => inplace_edit_control_css_class})
+          returning(content_tag(:div, active_scaffold_input_for(column), :style => "display:none;", :class => inplace_edit_control_css_class)) do
+            @record = old_record
+          end
         end
       end
 

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -265,7 +265,7 @@ module ActiveScaffold
 
       def render_column_calculation(column)
         calculation = column_calculation(column)
-        override_formatter = "render_#{column.name}_#{column.calculate}"
+        override_formatter = "render_#{column.name}_#{column.calculate.is_a?(Proc) ? :calculate : column.calculate}"
         calculation = send(override_formatter, calculation) if respond_to? override_formatter
 
         "#{"#{as_(column.calculate)}: " unless column.calculate.is_a? Proc}#{format_column_value nil, column, calculation}"

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 3
   - 1
-  - 6
-  version: 3.1.6
+  - 7
+  version: 3.1.7
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-20 00:00:00 Z
+date: 2011-10-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -186,6 +186,7 @@ files:
 - frontends/default/views/_form.html.erb~
 - frontends/default/views/_row.html.erb~
 - frontends/default/views/render_field.js.erb~
+- frontends/default/views/update_column.js.erb~
 - frontends/default/views/_form_association_footer.html.erb~
 - frontends/default/views/edit_associated.js.erb~
 - frontends/default/views/_list_inline_adapter.html.erb~
@@ -203,6 +204,7 @@ files:
 - frontends/default/views/on_update.js.erb~
 - frontends/default/views/on_create.js.erb~
 - frontends/default/views/_horizontal_subform_record.html.erb~
+- frontends/default/views/_list_with_header.html.erb~
 - lib/active_scaffold.rb
 - lib/active_scaffold_env.rb
 - lib/active_scaffold/actions/core.rb