azahara_schema 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ded2c6d31f576f6352ac1a71aa199652a02291d012c6ff46a0dee6cdba9ecebd
-  data.tar.gz: 230a4c8a4c4167edad95506997195b173eedbd81f45e3194058e6930493ee682
+  metadata.gz: 855ce45cd183a323fc4b01598cc8ed54b2440284cbe2e888baaf4940d8566d19
+  data.tar.gz: 9450e8a3f0d8d95baf2166f5ff0afe54e0558b71d9b49a91c6c8e09b01c3dc83
 SHA512:
-  metadata.gz: a672e53ee815b9b9f4d5ce4212153175d7c2013e45b4945f39ba3c2129d9dcfec7cba1e0d609a6365193143655c60a3e834b2b004ba539d02e770f3582955c92
-  data.tar.gz: 03aba7ed60de1e7ad8437ca25631c4325c0cd476bb8a9aad1a95aa3baa8191ef8103208427f227822956c26f833cb9086a316167beee0b3c2786b7d44abb73d8
+  metadata.gz: 115e3da2d1d6023c94f3a6052b7c4c5e817e7ffd81579a8ecbba6937d478731faa0dfa4bbb045d388293173d6d489945ab3eb2a74fdac0fa518ca7ca3494271a
+  data.tar.gz: 3084ce3dab7bd6d5f5845d3e5997ab93996af302ca16bd3764f196f23dc7ebd563d856b7f8f2f6a966ba4a03a634cf03b330e6214a17e53ce5611d0975489fac

data/app/helpers/azahara_schema/application_helper.rb

@@ -5,6 +5,15 @@ module AzaharaSchema
       schema.operators_for(filter_name).collect{|o| [o, o]}
     end
 
+    def azahara_operators_tag(schema, filter, name)
+      field_name = "f[#{name}]"
+      if schema.operators_for(name).count > 1
+        select_tag field_name, options_for_select(operators_for_select(schema, name), schema.operator_for(name)), class: 'form-control operator-field'
+      else
+        hidden_field_tag field_name, schema.operators_for(name).first, class: 'operator-field'
+      end
+    end
+
     def filter_field(schema, filter)
       case filter.format.format_name
       when 'list', 'love'
@@ -14,12 +23,29 @@ module AzaharaSchema
       end
     end
 
+    def azahara_filter_row(schema, filter, name=nil)
+      name ||= filter.filter_name
+      content_tag(:div, class: 'form-group row filter', data: {name: name}) do
+        s = ''.html_safe
+        s << content_tag(:div, label_tag("f[#{name}]", filter.attribute_name.human), class: 'col-md-2 control-label')
+
+        operators_tag = azahara_operators_tag(schema, filter, name)
+        if schema.operators_for(name).count > 1
+          s << content_tag(:div, operators_tag, class: 'col-md-2')
+          s << content_tag(:div, filter_field(schema, filter), class: 'col-md-8')
+        else
+          s << content_tag(:div, operators_tag + filter_field(schema, filter), class: 'col-md-10')
+        end
+        s
+      end
+    end
+
     # translates values to list_values
     # TODO: not needed to do it for every value - for example districts are not translatable
     def list_values_for_select(attribute)
       if attribute.format.format_name == 'list'
         attribute.available_values.collect do |l, val|
-          [t(l, scope: [:activerecord, :attributes, attribute.model.model_name.i18n_key, attribute.name.to_s.pluralize], default: l.to_s), val]
+          [attribute.attribute_name.human_list_value(l), val]
         end
       else
         attribute.available_values

data/app/views/azahara_schema/_filters.html.erb

@@ -1,39 +1,13 @@
 <div id="filters" class="schema-filters">
   <div id="filters_uncollapsable">
     <% schema.uncollapsable_filters.each do |name, filter| %>
-      <div class="form-group row filter" data-name="<%= name %>">
-        <div class="col-md-2 control-label"><%= label_tag "f[#{name}]", filter.attribute_name.human %></div>
-        <% if schema.operators_for(name).count > 1 %>
-          <div class="col-md-2"><%= select_tag "f[#{name}]", options_for_select(operators_for_select(schema, name), schema.operator_for(name)), class: 'form-control operator-field' %></div>
-          <div class="col-md-8">
-            <%= filter_field(schema, filter) %>
-          </div>
-        <% else %>
-          <div class="col-md-10">
-            <%= hidden_field_tag "f[#{name}]", schema.operators_for(name).first, class: 'operator-field' %>
-            <%= filter_field(schema, filter) %>
-          </div>
-        <% end %>
-      </div>
+      <%= azahara_filter_row(schema, filter, name) %>
     <% end %>
   </div>
   <% if schema.collapsable_filters.any? || lookup_context.template_exists?("#{schema.model.model_name.plural}/_additional_filters") %>
     <div id="filters_collapsable" class="collapse">
       <% schema.collapsable_filters.each do |name, filter| %>
-        <div class="form-group row filter" data-name="<%= name %>">
-          <div class="col-md-2 control-label"><%= label_tag "f[#{name}]", t('activerecord.attributes.'+schema.model.name.underscore+'.'+name, default: name.humanize) %></div>
-          <% if schema.operators_for(name).count > 1 %>
-            <div class="col-md-2"><%= select_tag "f[#{name}]", options_for_select(operators_for_select(schema, name), schema.operator_for(name)), class: 'form-control operator-field' %></div>
-            <div class="col-md-8">
-              <%= filter_field(schema, filter) %>
-            </div>
-          <% else %>
-            <div class="col-md-10">
-              <%= hidden_field_tag "f[#{name}]", schema.operators_for(name).first, class: 'operator-field' %>
-              <%= filter_field(schema, filter) %>
-            </div>
-          <% end %>
-        </div>
+        <%= azahara_filter_row(schema, filter, name) %>
       <% end %>
       <% if lookup_context.template_exists?("#{schema.model.model_name.plural}/_additional_filters") %>
         <%= render "#{schema.model.model_name.plural}/additional_filters", schema: schema %>

data/lib/azahara_schema/attribute_name.rb

@@ -37,7 +37,7 @@ module AzaharaSchema
     end
 
     def i18n_scoped_list_key(value, prefix=self.i18n_scoped_list_prefix)
-      prefix + '.' + value.to_s
+      (prefix + '.' + value.to_s).to_sym
     end
 
     def i18n_fallback_keys

data/lib/azahara_schema/version.rb

@@ -1,3 +1,3 @@
 module AzaharaSchema
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azahara_schema
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-10 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails