alchemy-ajax-form 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e25d83694739bb010bcd6ca0bdd447a6a77f048fee6e609a88a1cf78f20517e
-  data.tar.gz: ee26e7caeb40cafd1b6a47b6550e16c48e759615b4333b795ab2e5d38d1e1bd7
+  metadata.gz: ab4f8170326efc5737373e3c71789cd388572e4dc700f81350cf4b5aa98b388c
+  data.tar.gz: d4c3306b11ad49214b189e5faf06b6dee0aabb92073d4d926a6760fcdbf430ae
 SHA512:
-  metadata.gz: de9cd90aa04c6d9196932f14dd2334dcf46fb4123ce45e640c131973e21ce40e4ca811a547e332bfbf9406707e08611c5b93726ee8f4f234292e10d2b94c2e95
-  data.tar.gz: 99d0f9c3987d1dbf1f9b83c67e8238652d9c8a5d8fecf7d2b01dd8d2bb2e65b7b896c58e446962a1e60da6b8211d7452d3a363b0a661dc81523fbf93b3a187b6
+  metadata.gz: 872039ce8ef52c630b460bcb4b04ff3c2143f1e80b189491343bbc1d488df8c3ba7884fb97fa2c7926b315f48462703e80aece69fc42a15c0cc936a31488a36d
+  data.tar.gz: 1aac09b7d730c12112ab35e27a68fdf20976e7c3e004a06e5cc57c0024a5947736e54f318d0a5079c6eb5c000de4b510e86b796cea1a77abf938611ba11cc0ec

data/app/assets/stylesheets/alchemy/ajax/form/backend/custom_resource_show.scss

@@ -18,4 +18,84 @@
 
     }
   }
+}
+
+.resources-table-wrapper {
+  .search_panel {
+    position: fixed;
+    top: 127px;
+    background-color: #f7f7f7;
+    z-index: 2;
+    width: 100%;
+    padding: 15px 0px;
+    width: calc(100% - 159px);
+    padding: 15px;
+
+  }
+
+  .search_fields_group {
+    width: 100%;
+    box-sizing: border-box;
+
+    div.input {
+      width: 50%;
+      float: left;
+      padding: 0 15px;
+      margin: 2px 0;
+
+      &.full-width {
+        width: 100%;
+
+        input[type="url"],
+        input[type="text"],
+        input[type="email"],
+        input[type="password"],
+        textarea,
+        .select2-container,
+        .mce-tinymce,
+        .with-hint{
+          width: 100%;
+        }
+      }
+
+      input[type="url"],
+      input[type="text"],
+      input[type="email"],
+      input[type="password"],
+      textarea,
+      .select2-container,
+      .mce-tinymce,
+      .with-hint{
+        width: 100%;
+      }
+      .tinymce_container {
+        width: 100%;
+        float: left;
+      }
+
+      label {
+        width: 100%;
+        float: none;
+        text-align: left;
+      }
+    }
+
+    &:after {
+      content: "";
+      clear: both;
+      visibility: hidden;
+      display: block;
+      height: 0;
+    }
+
+
+  }
+
+  .action_buttons {
+
+
+    text-align: center;
+    margin-top: 15px;
+  }
+
 }

data/app/controllers/alchemy/admin/ajax_forms_controller.rb

@@ -7,7 +7,7 @@ module Alchemy
       end
 
       def index
-        @query = resource_handler.model.ransack(search_filter_params[:q])
+        @query = resource_handler.model.joins(language: :site).ransack(search_filter_params[:q])
         items = @query.result
         items = items.order(created_at: :desc)
 
@@ -25,7 +25,7 @@ module Alchemy
 
         respond_to do |format|
           format.html {
-            items = items.page(params[:page] || 1).per(per_page_value_for_screen_size)
+            items = items.page(params[:page] || 1).per(items_per_page)
             instance_variable_set("@#{resource_handler.resources_name}", items)
           }
           format.csv {
@@ -43,13 +43,17 @@ module Alchemy
         [
             # contrary to Rails' documentation passing an empty hash to permit all keys does not work
             {options: options_from_params.keys},
-            {q: [resource_handler.search_field_name, :s]},
+            {q: [resource_handler.search_field_name, :s].push(*permitted_ransack_attributes)},
             :tagged_with,
             :filter,
             :page
         ].freeze
       end
 
+      def permitted_ransack_attributes
+        [:language_id_eq, :language_site_id_eq]
+      end
+
       def load_resource
         @resource = resource_handler.model.find(params[:id])
         instance_variable_set("@#{resource_handler.resource_name}", @resource)

data/app/helpers/alchemy/admin/ajax_forms_helper.rb

@@ -4,14 +4,52 @@ module Alchemy
 
       def alchemy_body_class
         [
-          "ajax_forms",
-          controller_name,
-          action_name,
-          content_for(:main_menu_style),
-          content_for(:alchemy_body_class)
+            "ajax_forms",
+            controller_name,
+            action_name,
+            content_for(:main_menu_style),
+            content_for(:alchemy_body_class)
         ].compact
       end
 
+      def search_panel(options = {}, &block)
+        submit_button = options.fetch(:enable_submit, true)
+        klass = options.delete(:class) || []
+        content_tag(:div, class: "search_panel #{klass.join(" ")}", ** options) do
+          if @query
+            simple_form_for(@query, url: polymorphic_path([:admin, @query.klass]), method: :get) do |f|
+              sb = ActiveSupport::SafeBuffer.new
+
+              sb << content_tag(:div, class: "search_fields_group") do
+                search_fields = ActiveSupport::SafeBuffer.new
+                search_fields << f.input(resource_handler.search_field_name,
+                                         label: false,
+                                         input_html: {
+                                             class: 'search_input_field',
+                                             placeholder: Alchemy.t(:search)
+                                         },
+                                         wrapper_html: {
+                                             class: "full-width"
+                                         }
+
+                )
+
+                search_fields << capture do
+                  block.call(f)
+                end
+                search_fields
+              end
+              if submit_button
+                sb << content_tag(:div, class: "action_buttons") do
+                  f.submit(::I18n.t('alchemy_ajax_form.submit_search'))
+                end
+              end
+              sb
+            end
+          end
+        end
+      end
+
     end
   end
 end

data/app/views/alchemy/admin/ajax_forms/index.html.erb

@@ -0,0 +1,55 @@
+<% label_title = Alchemy.t("Create #{resource_name}", default: Alchemy.t('Create')) %>
+
+<% toolbar(
+       buttons: [
+           {
+               icon: :plus,
+               label: label_title,
+               url: new_resource_path,
+               title: label_title,
+               hotkey: 'alt+n',
+               dialog_options: {
+                   title: label_title,
+                   size: resource_window_size
+               },
+               if_permitted_to: [:create, resource_model]
+           },
+           {
+               icon: 'download',
+               url: resource_url_proxy.url_for(action: 'index', format: 'csv', q: search_filter_params[:q], sort: params[:sort]),
+               label: Alchemy.t(:download_csv),
+               title: Alchemy.t(:download_csv),
+               dialog: false,
+               if_permitted_to: [:index, resource_model]
+           }
+       ],
+       search: !lookup_context.any?("search_panel", lookup_context.prefixes, true)
+   ) %>
+
+<div id="archive_all" class="resources-table-wrapper<%= ' with_tag_filter' if resource_has_tags || resource_has_filters %>">
+
+  <%= render 'alchemy/admin/resources/table_header' %>
+  <% if lookup_context.any? "search_panel", lookup_context.prefixes, true %>
+    <%= render partial: "search_panel" %>
+  <% end %>
+  <%= render 'table' %>
+
+  <% if resource_has_tags || resource_has_filters %>
+    <div id="library_sidebar">
+      <% if resource_has_filters %>
+        <%= render 'filter_bar' %>
+      <% end %>
+
+      <% if resource_has_tags %>
+        <%= render 'tag_list' %>
+      <% end %>
+    </div>
+  <% end %>
+</div>
+
+
+<script type="text/javascript">
+    if ($(".search_panel").length > 0) {
+        $("#main_content table.list").css("padding-top", $(".search_panel").height() + 52 + "px")
+    }
+</script>

data/config/locales/it.yml

@@ -51,6 +51,8 @@ it:
   submit: "Invia"
   form_sended_succesfully: "Inviato con successo"
   show: Visualizza
+  alchemy_ajax_form:
+    submit_search: "Cerca..."
 
 
 

data/lib/alchemy/ajax/form/version.rb

@@ -1,7 +1,7 @@
 module Alchemy
   module Ajax
     module Form
-      VERSION = '1.1.5'
+      VERSION = '1.2.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-ajax-form
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Alessandro Baccanelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-20 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -132,6 +132,7 @@ files:
 - app/models/alchemy/ajax_form_ability.rb
 - app/views/alchemy/admin/ajax_forms/_resource.html.erb
 - app/views/alchemy/admin/ajax_forms/_table.html.erb
+- app/views/alchemy/admin/ajax_forms/index.html.erb
 - app/views/alchemy/admin/ajax_forms/show.html.erb
 - app/views/alchemy/ajax_forms/create.json.jbuilder
 - app/views/alchemy/ajax_forms_mailer/mjml_notify_message.mjml.erb