it-logica-application-backbone 1.2.24 → 1.2.25

data/VERSION

@@ -1 +1 @@
-1.2.24
+1.2.25

data/app/assets/javascripts/backbone_js/ladas_form_submitter.js

@@ -9,22 +9,74 @@
 //    }
 //
 //
-    var submit_timestamp = {};
-    function form_submit_watcher(watched_form_id) {
+var submit_timestamp = {};
+function form_submit_watcher(watched_form_id) {
 //        console.log(watched_form_id);
 //        console.log(submit_timestamp)
-        //ladas_loading_show();
-        //console.log("uaaa")
-        FilterChangeMarker.mark_active_filters(watched_form_id);
+    //ladas_loading_show();
+    //console.log("uaaa")
+    FilterChangeMarker.mark_active_filters(watched_form_id);
 
-        clearTimeout(submit_timestamp[watched_form_id]);
-        submit_timestamp[watched_form_id] = setTimeout(function() { form_submit(watched_form_id) }, 1000);
+    clearTimeout(submit_timestamp[watched_form_id]);
+    submit_timestamp[watched_form_id] = setTimeout(function () {
+        form_submit(watched_form_id)
+    }, 1000);
 
-    }
-    function form_submit(watched_form_id) {
+}
+function form_submit(watched_form_id) {
 //        console.log("submiting")
 //        console.log(watched_form_id);
-        $("#"+watched_form_id).submit();
-    }
+    $("#" + watched_form_id).submit();
+}
 //
-//})(jQuery);
+//})(jQuery);
+
+
+function submit_spec(form_id, spec_attr_name, spec_attr_value, options) {
+    // todo make all options by parameter
+    var form = $("#" + form_id);
+//    var form_original = $("#" + form_id);
+
+    // create new form by cloning without events
+//    var form = form_original.clone(false)
+//
+//    // disabling ajax
+//    form.removeAttr("data-remote");
+//
+//    form.attr("target", "_blank");
+//    form.attr("action", form_original.attr("action"));
+//    form.attr("style", "display: none;");
+//    form.attr("id", "");
+//
+//    // need to append it to browser html, otherwise it wont send in many browsers (with clone it works only with chrome)
+//    form_original.after(form);
+
+    //Create an input type dynamically.
+    var element = document.createElement("input");
+
+    //Assign different attributes to the element.
+    element.setAttribute("type", "hidden");
+    element.setAttribute("value", spec_attr_value);
+    element.setAttribute("name", spec_attr_name);
+
+    //Append the element in form
+    form.append(element);
+
+    form.submit();
+//    form.remove();
+}
+
+function on_clear_table_fill_attrs(link, form_id) {
+
+    var checkbox_pool = $("#" + form_id + "_checkbox_pool").val();    
+
+    // attrs I want to send when clearing form
+    var data = link.data("post");   
+
+    data["clear"] = true;
+    data["checkbox_pool"] = checkbox_pool;
+
+    link.data("post", data);
+}
+
+

data/app/views/helpers/editable_table/_build_table.html.erb

@@ -1,5 +1,5 @@
 <div class="page">
-  <%= render :partial => "/helpers/editable_table/build_table_text_description", :locals => {:settings => settings} %>
+  <%= render :partial => "/helpers/build_table_text_description", :locals => {:settings => settings} %>
 </div>
 <% if settings[:display_method]=="print_by_checkboxes" %>
     <div class="print-window-buttons" style="float:right">
@@ -22,21 +22,59 @@
         <% if settings[:checkboxes] %>
     <span>Vybráno: <strong>
       <span title="Počet označených řádků na všech stránkách" id="<%= settings[:form_id]+ "_active_checkboxes_count" %>">
-                                         <%= !settings[:params]["checkbox_pool"].blank? ? settings[:params]["checkbox_pool"].split(",").count : 0 %>
+                                         <%= !settings[:params][:checkbox_pool].blank? ? settings[:params][:checkbox_pool].split(",").count : 0 %>
                                        </span>
     </strong>
     </span>
+        <% end %>
 
+        <% if settings[:display_method].blank? %>
+            <% if settings[:checkboxes] %>
+                <script type="text/javascript">
+                    function submit_in_new_window(form_id, spec_attr_name, spec_attr_value) {
+                        var form_original = $("#" + form_id);
 
-        <% end %>
-        <%= render :partial => "/helpers/editable_table/build_table_checkbox_functions", :locals => {:settings => settings} %>
+                        // create new form by cloning without events
+                        var form = form_original.clone(false)
+
+                        // disabling ajax
+                        form.removeAttr("data-remote");
+
+                        form.attr("target", "_blank");
+                        form.attr("action", form_original.attr("action"));
+                        form.attr("style", "display: none;");
+                        form.attr("id", "");
+
+                        // need to append it to browser html, otherwise it wont send in many browsers (with clone it works only with chrome)
+                        form_original.after(form);
+
+                        //Create an input type dynamically.
+                        var element = document.createElement("input");
+
+                        //Assign different attributes to the element.
+                        element.setAttribute("type", "hidden");
+                        element.setAttribute("value", spec_attr_value);
+                        element.setAttribute("name", spec_attr_name);
 
+                        //Append the element in form
+                        form.append(element);
+
+                        form.submit();
+                        form.remove();
+                    }
+
+                </script>
+                <a href="#" class="btn print print_by_checkboxes" onclick="submit_in_new_window('<%= settings[:form_id] %>', '___display_method___', 'print_by_checkboxes'); return false;"><i class="icon-print"></i>&nbsp;
+                  Tisknout výběr</a>
+
+                <a href="#" class="btn print print_by_filter" onclick="if (confirm('Tato operace může trvat několik minut v této době prosím neobnovujte stránku. Maximální počet řádků pro tisk je 10000. Chcete pokračovat?')){submit_in_new_window('<%= settings[:form_id] %>', '___display_method___', 'print');} return false;"><i class="icon-print"></i>&nbsp;
+                  Tisknout vše dle filtrace</a>
+            <% end %>
+        <% end %>
       </div>
     </div>
 <% end %>
-
-<%= yield :table_form_tabs_above_form %>
-<%= form_tag settings[:filter_path], :html => {:'data-type' => 'html'}, :method => 'POST', :class => 'well dataGrid no_hover editable_table', :remote => true, :id => settings[:form_id] do |f| %>
+<%= form_tag settings[:filter_path], :html => {:'data-type' => 'html'}, :method => 'POST', :class => 'well dataGrid', :remote => true, :id => settings[:form_id] do |f| %>
     <% if settings[:display_method].blank? %>
         <% if content_for?(:table_form) %>
             <%= yield :table_form %>
@@ -44,52 +82,28 @@
     <% end %>
 
     <fieldset>
-      <%= render :partial => "/helpers/editable_table/build_table_filter", :locals => {:settings => settings} %>
+      <%= render :partial => "/helpers/build_table_filter", :locals => {:settings => settings} %>
 
       <% if settings[:display_method].blank? %>
           <% unless settings[:per_page].blank? %>
-                                <span class="select_for_per_page" style="float: right">Zobrazit na stránku: <%= select_tag("per_page_chosen", options_for_select(settings[:per_page], settings[:params]['per_page'].to_i),
-                                                                                                                           :onchange => "form_submit_watcher('#{settings[:form_id]}')",
-                                                                                                                           :class => "") %></span>
+          <span class="select_for_per_page" style="float: right">Zobrazit na stránku: <%= select_tag("per_page_chosen", options_for_select(settings[:per_page], settings[:params]['per_page'].to_i),
+                                                                                                     :onchange => "form_submit_watcher('#{settings[:form_id]}')",
+                                                                                                     :class => "") %></span>
           <% end %>
 
+
+
           <div class="<%= settings[:form_id] + '_ajax_pager' %>">
-            <%= render :partial => 'helpers/editable_table/build_table_pager', :locals => {:settings => settings, :placement => "placement-up"} %>
+            <%= render :partial => 'helpers/build_table_pager', :locals => {:settings => settings, :placement => "placement-up"} %>
           </div>
-
       <% end %>
 
-      <%= render :partial => "/helpers/editable_table/build_table_wrapper", :locals => {:settings => settings} %>
+      <%= render :partial => "/helpers/build_table_wrapper", :locals => {:settings => settings} %>
 
       <% if settings[:display_method].blank? %>
-          <div class="<%= settings[:form_id] + '_ajax_pager' %>">
-            <%= render :partial => 'helpers/editable_table/build_table_pager', :locals => {:settings => settings, :placement => "placement-down"} %>
+          <div class="<%= settings[:form_id] + '_ajax_pager' %> parent-filter-paging placement-down">
+            <%= render :partial => 'helpers/build_table_pager', :locals => {:settings => settings, :placement => "placement-down"} %>
           </div>
       <% end %>
     </fieldset>
-<% end %>
-
-
-
-<div id="modal_cell_editing" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-  <!--<div class="modal-header">-->
-  <!--<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>-->
-  <!--<h3 id="myModalLabel">Modal header</h3>-->
-  <!--</div>-->
-  <!--<div class="modal-body">-->
-  <!--<p>One fine body…</p>-->
-  <!--</div>-->
-  <!--<div class="modal-footer">-->
-  <!--<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>-->
-  <!--<button class="btn btn-primary">Save changes</button>-->
-  <!--</div>-->
-</div>
-<script type="text/javascript">
-    EditableTableModalDialog.init('modal_cell_editing')
-</script>
-
- <%# moved here, document ready removed, it has been called when printed etc, ready is called event when form is send to target _blank  %>
-<%= render :partial => "/helpers/editable_table/build_table_ajax_callback_code", :locals => {:settings => settings} %>
-
-
-
+<% end %>

data/app/views/helpers/editable_table/_build_table_pager.html.erb

@@ -1,9 +1,16 @@
 <div class="filter-paging clearfix <%= placement if defined? placement %>">
   <div class="reset">
-    <%= ajax_post_link_to "Smazat filtr", settings[:filter_path],
-                          "data-content_id" => settings[:content_id].blank? ? "" : settings[:content_id],
-                          :class => "btn",
-                          "data-post" => {:clear => true}.to_json %>
+    <%= link_to "Smazat filtr", settings[:filter_path],
+                "data-content_id" => settings[:content_id].blank? ? "" : settings[:content_id],
+                :class => "btn",
+                "data-post" => {:clear => true}.to_json,
+                "onclick" => "on_clear_table_fill_attrs($(this), '#{settings[:form_id]}'); parse_link_and_post($(this)); return false;"
+    %>
+    <%#= link_to "Smazat filtr", "#",
+                              "data-content_id" => settings[:content_id].blank? ? "" : settings[:content_id],
+                              :remote => true,
+                              :class => "btn",
+                              :onclick => "submit_spec('#{settings[:form_id]}', 'clear', 'true'); return false;" %>
   </div>
 
   <% if settings[:data_paginate].total_pages > 1 %>

data/it-logica-application-backbone.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "it-logica-application-backbone"
-  s.version = "1.2.24"
+  s.version = "1.2.25"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ladas"]
-  s.date = "2012-11-26"
+  s.date = "2012-12-03"
   s.description = "longer description of your gem"
   s.email = "ladislav.smola@it-logica.cz"
   s.extra_rdoc_files = [

data/lib/controller_mixins/renderer_instance_methods.rb

@@ -92,7 +92,7 @@ module ControllerMixins
         else
           case export_method
             when "csv"
-              @settings = class_obj.prepare_settings(logged_user, data, @settings, default_params ,nil, 50000)
+              @settings = class_obj.prepare_settings(logged_user, data, @settings, default_params, nil, 50000)
               generate_and_return_csv(get_data_for_csv_from_settings(@settings))
             when "csv_by_checkboxes"
               settings[:filter_method] = "only_by_checkboxes"
@@ -131,6 +131,7 @@ module ControllerMixins
 
     def render_table_on_clear_filter(settings, show_table_method)
       session["#{settings[:form_id]}_params"] = ""
+
       render :layout => false, :action => (show_table_method.blank? ? :index : show_table_method)
     end
 
@@ -164,6 +165,11 @@ module ControllerMixins
       default_params = settings[:default].dup
       default_params[:order_by] = settings[:default][:order_by] + " " + settings[:default][:order_by_direction] if !settings[:default][:order_by].blank? && !settings[:default][:order_by_direction].blank?
       default_params[:order_by] = settings[:default][:order] if !settings[:default][:order].blank?
+
+      if defined?(ModelMixins::TableBuilderClassMethods::ON_CLEAR_FILTER_CLEAR_CHECKBOXES) && !ModelMixins::TableBuilderClassMethods::ON_CLEAR_FILTER_CLEAR_CHECKBOXES
+        default_params[:checkbox_pool] = params["checkbox_pool"]
+      end
+
       default_params
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 1.2.24
+  version: 1.2.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &72441200 !ruby/object:Gem::Requirement
+  requirement: &85304670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72441200
+  version_requirements: *85304670
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &72440740 !ruby/object:Gem::Requirement
+  requirement: &85304210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72440740
+  version_requirements: *85304210
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &72440300 !ruby/object:Gem::Requirement
+  requirement: &85303750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *72440300
+  version_requirements: *85303750
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &72439720 !ruby/object:Gem::Requirement
+  requirement: &85303180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *72439720
+  version_requirements: *85303180
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &72439190 !ruby/object:Gem::Requirement
+  requirement: &85302650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *72439190
+  version_requirements: *85302650
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &72438820 !ruby/object:Gem::Requirement
+  requirement: &85302290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72438820
+  version_requirements: *85302290
 description: longer description of your gem
 email: ladislav.smola@it-logica.cz
 executables: []
@@ -618,7 +618,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -230153933
+      hash: -605749421
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: