fullstack-admin 0.1.36 → 0.1.37

data/TODO.tasks

@@ -2,28 +2,38 @@
 = Fullstack Admin Roadmap =
 ===========================
 
-- fix delete not removing rows/thumbnails on success
+✓ fix delete not removing rows/thumbnails on success
 
 ✓ Better rendering for boolean input
 
-- Nested forms for Has Many associations 
+✓ Nested forms for Has Many associations 
   ✓ Sorting
   ✓ autogenerate from has_many
-  - skip input for associated model
+  ✓ skip input for associated model
   
 ✓ Fix production issues
 
 ✓ Multiple choice input with chosen
 
+✓ Image inputs NB. Changed to file_input
+    ✓ detect smaller image size for thumbnails
+    ✓ inference of input type from model
+
+✓ Ckeditor: upload assets to S3 according to app.config 
+
+- Localizable models
+    - Create Localized module: a model is localizable if has a :locale field (cms?)
+    - Add a scope to Localized to find models within the current locale (cms?)
+    
+    - Create an option to specify the admin_locale
+    - add a before filter to Admin::BaseController that uses the default locale for the admin
+    - Split localized models index into tabs (either through ajax?)
+    - Let the programmer decide a default locale and a set of available locales
+    - Translations for locale codes
+    
 - Form for accepts_nested_attributes_for and has_one 
-
-- Image inputs
-    - detect smaller image size for thumbnails
-    - inference of input type from model
-
 - Optional tracking of author/updaters for every model (CMS?)
 
-
 ==================
 = Long Run Goals =
 ==================

data/VERSION

@@ -1 +1 @@
-0.1.36
+0.1.37

data/app/helpers/admin_form_helper.rb

@@ -51,18 +51,51 @@ module AdminFormHelper
       except_arg = options[:except] || []
       except_attributes = except_arg + model.protected_attributes.to_a + %W(created_at updated_at slug slugs lat lng position)
       
-      only_attributes.map! {|a| :"#{a}"}
-      except_attributes.map! {|a| :"#{a}"}
-              
-      columns = model.schema.hierarchy_field_names.map! {|a| :"#{a}"}
+      only_attributes.map! {|a| a.to_s}
+      except_attributes.map! {|a| a.to_s}
+      
+      columns = model.schema.hierarchy_field_names
+      
+      # ===============
+      # = Attachments =
+      # ===============
     
       attachment_definitions = (model.attachment_definitions || {}).keys
       attachment_columns = attachment_definitions.map {|a|
-        [:"#{a}_file_name", :"#{a}_file_size", :"#{a}_content_type", :"#{a}_updated_at"]
+        ["#{a}_file_name", "#{a}_file_size", "#{a}_content_type", "#{a}_updated_at"]
         }.flatten
-      
+            
       columns -= attachment_columns
       columns += attachment_definitions
+
+          
+      # ================
+      # = Associations =
+      # ================
+
+      columns = columns.map {|field_name|
+         field_name.to_s.gsub(/_id$/, "").gsub(/_type$/, "")
+      }.uniq
+      
+      belongs_to_associations = model.reflect_on_all_associations(:belongs_to).select {|a|
+        !a.options[:polymorphic]
+      }.map {|assoc| assoc.name.to_s}
+    
+      polymorphic_associations = model.reflect_on_all_associations(:belongs_to).select {|a|
+        a.options[:polymorphic]
+      }.map {|assoc| assoc.name.to_s}
+    
+      has_many_associations = model.reflect_on_all_associations(:has_many).select {|a| 
+        a.options[:autosave]
+      }.map {|assoc| assoc.name.to_s}
+      
+      columns -= polymorphic_associations
+      columns += has_many_associations
+      
+      
+      # ====================================
+      # = Intersect with :only and :except =
+      # ====================================
       
       if only_attributes.any?
         columns = columns.select {|k| only_attributes.include?(k)}
@@ -70,42 +103,42 @@ module AdminFormHelper
         columns = columns.delete_if {|k| except_attributes.include?(k)}
       end
 
+
+      # =============
+      # = Rendering =
+      # =============
+      
       buff = ""
         
-      columns.each {|k|
-        k = "#{k}".gsub(/_ids?$/, "").gsub(/_type$/, "").to_sym
-        assoc = model.reflect_on_association(k) 
-        if assoc && assoc.belongs_to?
-          unless assoc.options[:polymorphic]
-            buff << @target.input(k, :as => :select)
-          end
-        else
-          
-          if field = model.schema.hierarchy_fields[k]
-            if field.options[:markup]
-              buff << @target.input(k, :as => :markup)
-            elsif field.options[:simple_markup]
-              buff << @target.input(k, :as => :simple_markup)
-            else
-              buff << @target.input(k)
-            end
-          else 
-            buff << @target.input(k)          
-          end
-          
-        end
+      columns.each do |column|
+        sym = column.to_sym
+        field = model.schema.hierarchy_fields[sym]
+        is_belongs_to_associaiton = belongs_to_associations.include?(column)
+        is_has_many_association = has_many_associations.include?(column)
         
-      }
-      
-      buff = self.inputs do
-        buff.html_safe
+        buff << if is_belongs_to_associaiton
+          @target.input(sym, :as => :select)
+        
+        elsif is_has_many_association
+           association_inputs(sym)
+         else
+           input_type = if field && field.options[:markup]
+             :markup
+           elsif field && field.options[:simple_markup]
+             :simple_markup
+           else
+             nil
+           end
+           
+           @target.input(sym, :as => input_type)
+
+        end
       end
       
-      model.reflect_on_all_associations(:has_many).select {|m| m.options[:autosave] }.each do |assoc|
-        buff << association_inputs(assoc.name)
+      inputs do
+        buff.html_safe
       end
-      
-      buff
+    
     end
  
     def resource_submit

data/app/models/ckeditor/attachment_file.rb

@@ -1,7 +1,5 @@
 class Ckeditor::AttachmentFile < Ckeditor::Asset
-  has_attached_file :data,
-                    :url => "/ckeditor_assets/attachments/:id/:filename",
-                    :path => ":rails_root/public/ckeditor_assets/attachments/:id/:filename"
+  has_attached :data
   
   validates_attachment_size :data, :less_than => 100.megabytes
   validates_attachment_presence :data

data/app/views/admin/base/_nested_form.html.erb

@@ -40,7 +40,7 @@
         <% begin %>
         <%= render :partial => "admin/#{association}/associated_fields", :locals => {:f => f} %>
         <% rescue ActionView::MissingTemplate %>
-          <%= f.resource_inputs %>
+          <%= f.resource_inputs :except => [resource_name] %>
         <% end %>
         
         <%= f.hidden_field(:_destroy, :class => "destroy-associated-resource") %>

data/app/views/admin/base/destroy.js.coffee

@@ -1,4 +1,4 @@
-<% if instance_variable_get("@#{controller_name.singularize}").destroyed? %>
+<% if current_resource.destroyed? %>
 $("a[data-method='delete']").filter("[href='<%=j request.path %>']").closest("tr, li").remove()
 notify_notice('<%=j t("fullstack.admin.flash.success.delete")  %>')
 <% else %>

data/config/locales/it.yml

@@ -37,7 +37,7 @@ it:
         success:
           generic: "Cambiamenti salvati con successo"
           update: "Documento salvato con successo"
-          delete: "Document eliminato con successo"
+          delete: "Documento eliminato con successo"
 
         error:
           generic: "Cambiamenti non salvati a causa di un errore"

data/config/locales/labels.it.yml

@@ -29,7 +29,7 @@ it:
       image: "Immagine"
       icon: "Icona"
       external: "Esterno"
-      nofollow: "Nofollow"
+      nofollow: "Non segnalare ai motori di ricerca"
       alignment_right: "Allinea a destra"
       browser_title: "Titolo del browser"
       seo_title: "Titolo SEO" 

data/fullstack-admin.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-admin"
-  s.version = "0.1.36"
+  s.version = "0.1.37"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.36
+  version: 0.1.37
   prerelease: 
 platform: ruby
 authors:
@@ -1329,7 +1329,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2718455350685329463
+      hash: -4320214889325089488
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: