bhf 0.2.7 → 0.2.8

data/app/helpers/bhf/entries_helper.rb

@@ -12,5 +12,12 @@ module Bhf
       }
     end
 
+    def is_image?(file)
+      ['.png', '.jpg', '.jpeg', '.gif', '.svg'].each do |file_extention|
+        return true if file.downcase.include? file_extention
+      end
+      false
+    end
+
   end
 end

data/app/views/bhf/application/index.haml

@@ -1,3 +1,3 @@
-%ul
+%ul.basic_info_list
   - @config.pages.each do |page|
     %li= link_to t("bhf.pages.navigation.#{page}", :default => page.capitalize), bhf_page_path(page)

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

@@ -1,5 +1,16 @@
-= node f, field do
-  - file = f.object.send(field.name)
-  - if file.is_a? String
-    = image_tag f.object.send(field.name), :class => 'uploaded_image'
-  = f.file_field field.name
+- # no file upload on ajax submit :(
+- unless @quick_edit
+  = node f, field do
+    = f.fields_for field.name do |f_file|
+      - file = f.object.send(field.name)
+      - if file.is_a?(String)
+        - if is_image?(file)
+          = image_tag file, :class => 'uploaded_image'
+        - else
+          = link_to file, file, :class => 'uploaded_file'
+      - unless file.blank?
+        .file_delete
+          = f_file.check_box :delete
+          = f_file.label :delete, t('bhf.helpers.file.delete')
+
+      = f_file.file_field :file

data/app/views/bhf/pages/_search.haml

@@ -14,4 +14,3 @@
   = f.hidden_field :per_page, :value => get_value(:per_page, p)
   = f.hidden_field :order, :value => get_value(:order, p)
   = f.hidden_field :direction, :value => get_value(:direction, p)
-    

data/app/views/layouts/bhf/application.haml

@@ -7,7 +7,7 @@
     %link{:href => '/favicon.ico', :rel => 'icon', :type => 'image/x-icon'}
     = stylesheet_link_tag(['bhf'] + Bhf::Engine.config.css.to_a)
     = javascript_include_tag 'bhf'
-    =# javascript_include_tag 'bhf/mootools-core-1.3.1-full-compat-yc.js', 'bhf/mootools-more-1.3.1.1.js', 'bhf/mootools_rails_driver-0.4.1.js', 'bhf/class/BrowserUpdate', 'bhf/class/Ajaxify', 'bhf/class/AjaxEdit', 'bhf/class/MooEditable', 'bhf/class/Datepicker', 'bhf/class/MultipleFields', 'bhf/bhf_application'
+    =# javascript_include_tag 'bhf/mootools-core-1.3.2-full-compat-yc.js', 'bhf/mootools-more-1.3.2.1.js', 'bhf/mootools_rails_driver-0.4.1.js', 'bhf/class/BrowserUpdate', 'bhf/class/Ajaxify', 'bhf/class/AjaxEdit', 'bhf/class/MooEditable', 'bhf/class/Datepicker', 'bhf/class/MultipleFields', 'bhf/bhf_application'
   %body
     %header
       %h1= link_to image_tag('logo_bhf.png'), root_url

data/config/locales/de.yml

@@ -25,7 +25,9 @@ de:
       validation:
         header: "Durch diese Fehler konnte %{name} nicht gespeichert werden:"
         error: Fehler
-    
+      file:
+        delete: Datei löschen
+
     quick_edit:
       buttons:
         cancel: Abbrechen

data/config/locales/en.yml

@@ -28,6 +28,8 @@ en:
       validation:
         header: "%{error} prohibited this %{name} from being saved:"
         error: error
+      file:
+        delete: Delete file
     
     quick_edit:
       buttons:

data/lib/bhf/active_record/active_record.rb

@@ -0,0 +1,41 @@
+module Bhf
+  module ActiveRecord
+    module Object
+      extend ActiveSupport::Concern
+      
+      def to_bhf_s
+        return title if self.respond_to? :title
+        return name if self.respond_to? :name
+
+        if self.respond_to? :attributes
+          return title if attributes['title']
+          return name if attributes['name']
+          return "#{self.class.to_s.humanize} ID: #{send(self.class.primary_key)}" if attributes[self.class.primary_key]
+        end
+
+        self.to_s.humanize
+      end
+
+      module ClassMethods
+        def bhf_default_search(search_params)
+          return if (search_term = search_params[:text]).blank?
+          where_statement = []
+          columns_hash.each_pair do |name, props|
+            is_number = search_term.to_i.to_s == search_term || search_term.to_f.to_s == search_term
+
+            if props.type == :string || props.type == :text
+              where_statement << "#{name} LIKE '%#{search_term}%'"
+            elsif props.type == :integer && is_number
+              where_statement << "#{name} = #{search_term.to_i}"
+            elsif props.type == :float && is_number
+              where_statement << "#{name} = #{search_term.to_f}"
+            end
+          end
+
+          where_statement.join(' OR ')
+        end
+      end
+      
+    end
+  end
+end

data/lib/bhf/active_record/upload.rb

@@ -0,0 +1,45 @@
+module Bhf
+  module ActiveRecord
+    module Upload
+      extend ActiveSupport::Concern
+
+      included do
+        before_save :bhf_upload
+        cattr_accessor :bhf_upload_settings
+      end
+
+      module ClassMethods
+        def setup_upload(settings)
+          self.bhf_upload_settings = settings.each_with_object([]) do |s, obj|
+            obj << {:path => '', :name => :file}.merge(s)
+          end
+        end
+      end
+
+      def bhf_upload
+        self.class.bhf_upload_settings.each do |settings|
+          name_was = send("#{settings[:name]}_was")
+          param_name = read_attribute(settings[:name])
+          file_string = if param_name && param_name[:delete].to_i != 0
+            # File.delete(settings[:path] + name_was.to_s) if File.exist?(settings[:path] + name_was.to_s)
+            nil
+          else
+            file = param_name && param_name[:file]
+            if file.is_a? ActionDispatch::Http::UploadedFile
+              # File.delete(settings[:path] + name_was.to_s) if File.exist?(settings[:path] + name_was.to_s)
+
+              filename = Time.now.to_i.to_s+'_'+file.original_filename.downcase.sub(/[^\w\.\-]/,'_')
+              path = File.join(settings[:path], filename)
+              File.open(path, 'w') { |f| f.write(file.read) }
+              filename
+            else
+              name_was
+            end
+          end
+          write_attribute settings[:name], file_string
+        end
+      end
+
+    end
+  end
+end

data/lib/bhf/pagination.rb

@@ -104,7 +104,7 @@ module Bhf
           @b_p.template.bhf_page_path(
             @platform.page_name,
             @b_p.template.params.merge(@platform.name => platform_params)
-          ), attributes
+          ), {:class => 'page_number'}.merge(attributes)
         )
       end
 

data/lib/bhf.rb

@@ -4,7 +4,8 @@ end
 
 require 'engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
 require 'bhf/i18n'
-require 'bhf/active_record'
+require 'bhf/active_record/active_record'
+require 'bhf/active_record/upload'
 require 'bhf/view_helpers'
 require 'bhf/data'
 require 'bhf/platform'
@@ -15,6 +16,5 @@ require 'bhf/form'
 ::I18n.send :include, Bhf::I18nTranslationFallbackHelper
 
 ::ActiveRecord::Base.send :include, Bhf::ActiveRecord::Object
-::ActiveRecord::Base.send :extend,  Bhf::ActiveRecord::Self
 
 ::ActionView::Base.send :include, Bhf::ViewHelpers::ActionView