bhf 0.7.12 → 0.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7717f7f0c45558fea58b5b3291ad36d6e6bd3859
-  data.tar.gz: 07ec367b90eeeb5402a83399fc7ae321587ce1d2
+  metadata.gz: 58d3c238599cf5b5d56b13769f3fb6ca7bf25485
+  data.tar.gz: a53e7eb6589687782d07be6e0b53e5bb5add59a5
 SHA512:
-  metadata.gz: da31a849f79f4ccae09235f4accafe382540f97e25239404fcc97f2a7b6e35ee1f4734189cd66ae89bd60717394092f49beecb12d0a30910c88350a91029fd12
-  data.tar.gz: 010e4e702c586a48d5ccac78cf2c28c654deb3bca945c634936f062c0bb51a8efb5f1d20c9f91cdd0d1043b52ecb93e508404287e9aa598267992b99e069a9b5
+  metadata.gz: d04a4904b6d237ce6a5edcb09fe10bc89c142137f0ba00f1e2695959f5aadb5fcdf0c3c3ef9dc7d74c67fa41ab4460d6b2b862ecff486987c05b9d093a390b5c
+  data.tar.gz: e7be85db1268a307a1725d9fa0ee92e9c528d9fa17fedc07355b66ba9ff28d7963e5434ecd90f2b3d82b8151de89bbf219c9a005d2b0b0bafb885acc364db1b9

data/app/controllers/bhf/entries_controller.rb

@@ -80,12 +80,10 @@ class Bhf::EntriesController < Bhf::ApplicationController
   end
   
   def sort
-    sort_attr = (@platform.sortable_property || @platform.sortable).to_sym
-    
     params[:order].each do |order|
       @model.
         find(order[1].gsub("_#{@platform.name}", '')).
-        update_attribute(sort_attr, order[0].to_i)
+        update_attribute(@platform.sortable_property, order[0].to_i)
     end
     
     head :ok

data/app/helpers/bhf/application_helper.rb

@@ -20,6 +20,16 @@ module Bhf
     def delete_t(platform)
       t("bhf.helpers.entry.models.#{platform.model_name}.delete", platform_name: platform.title_singular, default: t('bhf.helpers.entry.delete')).html_safe
     end
+    
+    def find_smallest_size_url_for_file(file)
+      if file.exists?(:thumb)
+        file.url(:thumb)
+      elsif file.exists?(:medium)
+        file.url(:medium)
+      else
+        file.url
+      end
+    end
 
   end
 end

data/app/views/bhf/_footer.haml

@@ -1,6 +1,6 @@
 - if @start_time
-  %p.state= I18n.t('bhf.footer.state', time: (Time.now-@start_time).round(2)).html_safe
+  %p.state= t('bhf.footer.state', time: (Time.now-@start_time).round(2)).html_safe
 
-%p.copy= I18n.t('bhf.footer.copy').html_safe
+%p.copy= t('bhf.footer.copy').html_safe
 
-%p.info= I18n.t('bhf.footer.info').html_safe
+%p.info= t('bhf.footer.info').html_safe

data/app/views/bhf/entries/form/column/_paperclip.haml

@@ -4,7 +4,7 @@
     - file = f.object.send(field.name)
     - if file.file?
       - if ['image/jpeg', 'image/pjpeg', 'image/jpg', 'image/png', 'image/tif', 'image/gif'].include?(f.object.send("#{field.name}_content_type"))
-        = image_tag file.url, class: 'uploaded_image'
+        = image_tag find_smallest_size_url_for_file(file), class: 'uploaded_image'
       - else
         = link_to f.object.send("#{field.name}_file_name"), file.url, class: 'uploaded_file'
 

data/lib/bhf/platform.rb

@@ -140,16 +140,16 @@ module Bhf
       end
     end
 
-    def columns_count
-      columns.count + (sortable ? 2 : 1)
-    end
-
     def sortable
       table_options 'sortable'
     end
 
     def sortable_property
-      table_options 'sortable_property'
+      (@data['sortable_property'] || :position).to_sym
+    end
+
+    def columns_count
+      columns.count + (sortable ? 2 : 1)
     end
 
     def hide_edit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.7.12
+  version: 0.7.13
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails