typus 0.9.21 → 0.9.22

data/VERSION

@@ -1 +1 @@
-0.9.21
+0.9.22

data/app/helpers/admin/form_helper.rb

@@ -93,15 +93,25 @@ module Admin::FormHelper
     HTML
   end
 
+  # WEI: Added image preview.
   def typus_file_field(attribute)
-
     attribute_display = attribute.split('_file_name').first
-
+    unless @item.send(attribute).blank?
+      if attachment = @item.send(attribute_display)
+        if (@item.send("#{attribute_display}_content_type") =~ /^image\/.+/) and (attachment.styles.member?(:thumbnail) or attachment.styles.member?(:edit))
+          style = attachment.styles.member?(:thumbnail) ? :thumbnail : :edit
+          preview = image_tag attachment.url(style)
+        else
+          preview = link_to @item.send(attribute), attachment.url
+        end
+      end
+    end
     <<-HTML
-<li><label for="item_#{attribute}">#{_(attribute_display.humanize)}</label>
-#{file_field :item, attribute.split("_file_name").first, :disabled => attribute_disabled?(attribute)}</li>
+    <li><label for="item_#{attribute}">#{_(attribute_display.humanize)}</label>
+      #{file_field :item, attribute.split("_file_name").first, :disabled => attribute_disabled?(attribute)}
+      #{preview}
+    </li>
     HTML
-
   end
 
   def typus_password_field(attribute)
@@ -225,7 +235,9 @@ module Admin::FormHelper
       association = reflection.macro
       foreign_key = reflection.through_reflection ? reflection.primary_key_name.pluralize : reflection.primary_key_name
 
-      link_options = { :controller => "admin/#{field}", 
+      #WEI: Changed link to use type name rather than field:
+      #WEI: link_options = { :controller => "admin/#{field}", 
+      link_options = { :controller => "admin/#{model_to_relate_as_resource.pluralize}", 
                        :action => 'new', 
                        :back_to => "#{@back_to}##{field}", 
                        :resource => @resource[:self].singularize, 

data/app/helpers/typus_helper.rb

@@ -8,7 +8,7 @@ module TypusHelper
     returning(String.new) do |html|
 
       Typus.applications.each do |app|
-
+  
         available = Typus.application(app).map do |resource|
                       resource if @current_user.resources.include?(resource)
                     end
@@ -21,7 +21,7 @@ module TypusHelper
 </tr>
         HTML
 
-        available.compact.each do |model|
+        available.compact.sort_by{|x| x.constantize.typus_human_name }.each do |model|
 
           klass = model.constantize
           klass_resource = klass.name.tableize

data/typus.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{typus}
-  s.version = "0.9.21"
+  s.version = "0.9.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francesc Esplugas"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: typus
 version: !ruby/object:Gem::Version 
-  version: 0.9.21
+  version: 0.9.22
 platform: ruby
 authors: 
 - Francesc Esplugas