fullstack-admin 0.1.42 → 0.1.43

data/VERSION

@@ -1 +1 @@
-0.1.42
+0.1.43

data/app/assets/stylesheets/support/bootstrap-workarounds.css

@@ -36,4 +36,8 @@ overflow: visible;
 
 .tabs-left .nav-list.nav-tabs {
   padding-right: 0;
+}
+
+.popover {
+  z-index: 18000;
 }

data/app/assets/stylesheets/support/forms.css

@@ -224,5 +224,7 @@ list-style-type: none;
 .file-input-attachment-filename {
   width: 200px;
   display: inline-block;
-  overflow: hidden;
+ 	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }

data/app/helpers/admin_form_helper.rb

@@ -78,17 +78,23 @@ module AdminFormHelper
       }.uniq
       
       belongs_to_associations = model.reflect_on_all_associations(:belongs_to).select {|a|
-        !a.options[:polymorphic]
+        !a.options[:polymorphic] && !a.options[:autosave]
       }.map {|assoc| assoc.name.to_s}
-    
+      
       polymorphic_associations = model.reflect_on_all_associations(:belongs_to).select {|a|
-        a.options[:polymorphic]
+        a.options[:polymorphic] && !a.options[:autosave]
       }.map {|assoc| assoc.name.to_s}
+      
+      autosave_belongs_to     = model.reflect_on_all_associations(:belongs_to).select {|a|
+        a.options[:autosave]
+      }.map {|assoc| assoc.name.to_s}.compact
     
       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
       
@@ -115,12 +121,14 @@ module AdminFormHelper
         field = model.schema.hierarchy_fields[sym]
         is_belongs_to_associaiton = belongs_to_associations.include?(column)
         is_has_many_association = has_many_associations.include?(column)
+        is_autosave_belongs_to = autosave_belongs_to.include?(column)
         
         buff << if is_belongs_to_associaiton
           @target.input(sym, :as => :select)
         
-        elsif is_has_many_association
-           association_inputs(sym)
+        elsif is_has_many_association || is_autosave_belongs_to
+           association_inputs(sym)       
+
          else
            opts = {}
            args = [sym]
@@ -169,8 +177,31 @@ module AdminFormHelper
     end
 
     def association_inputs(association)
-       @target.template.render :partial => "associated_resources_table", :locals => { 
-        :association => association, :f => self } 
+      assoc_str = association.to_s
+      is_singular = assoc_str.pluralize != assoc_str and assoc_str.singularize == assoc_str
+      
+      if is_singular
+        if @target.template.partial?("nested_belongs_to_#{assoc_str}_fields")
+          @target.template.render :partial => "nested_belongs_to_#{assoc_str}_fields", :locals => { 
+           :association => association, :f => self }         
+        else
+          @target.template.render :partial => "nested_belongs_to_fields", :locals => { 
+           :association => association, :f => self }         
+        end
+
+      else
+        
+        if @target.template.partial?("associated_#{assoc_str}_table")
+          @target.template.render :partial => "associated_#{assoc_str}_table", :locals => { 
+           :association => association, :f => self }
+        else
+          @target.template.render :partial => "associated_resources_table", :locals => { 
+           :association => association, :f => self }         
+        end
+  
+        
+      end
+
     end
 
   end # ~

data/app/helpers/scaffold_helper.rb

@@ -21,7 +21,8 @@ module ScaffoldHelper
     end
 
     def labelize_attribute_name(method)
-      I18n.t("helpers.label.#{method}", :default => method.to_s.humanize)
+    method ||= "id" 
+         I18n.t("helpers.label.#{method}", :default => method.to_s.humanize)
     end
 
     def sort_link(method)

data/app/inputs/file_input.rb

@@ -3,11 +3,29 @@ class FileInput < FormtasticBootstrap::Inputs::FileInput
     generic_input_wrapping do
       attachment = object.send(method)
       
+      info_popup = "" 
+      with_geom = attachment.styles.values.select do |decl|
+        decl.geometry
+      end
+        
+      if with_geom.any?
+        infos = "<table class='table table-striped'>"
+        with_geom.each do |s|
+          infos << "<tr><th>#{s.name}</th><td>#{s.geometry}</td></tr>"
+        end
+        infos << "</table>"
+        title = I18n.t('fullstack.admin.info', :default => "Info")
+        content = template.send :h, infos
+        info_popup << "&nbsp; <i class='icon icon-info-sign' title='#{title}' data-content='#{content}' data-toggle='popover'></i>"
+      end
+      
+      
       if !attachment.exists?
         <<-eos
           <span class="file-input-attachment-filename">
             <i class="icon icon-file"></i> (#{I18n.t('fullstack.admin.no_file_uploaded', :default => "No file uploaded")})
           </span> 
+          <span>#{info_popup}</span>
         
           <a class="btn btn-small file-input-choose-file-button" href="javascript:void(0)">
             <i class="icon icon-upload"></i>
@@ -33,11 +51,12 @@ class FileInput < FormtasticBootstrap::Inputs::FileInput
         <<-eos
         
         <span  class="file-input-attachment-filename"><i class="icon icon-file"></i> #{template.send(:html_escape, attachment.url.split("/").last.split("?").first)} </span> 
+        <span>#{info_popup}</span>
+        
         <a class="btn btn-small file-input-choose-file-button" href="javascript:void(0)">
           <i class="icon icon-upload"></i>
           #{I18n.t('fullstack.admin.change', :default => "Change")}
         </a>
-        
         <span class="dropdown">
           <a class="btn dropdown-toggle btn-small" data-toggle="dropdown" href="#">
             <i class="icon icon-eye-open"></i>

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

@@ -0,0 +1,7 @@
+<%= f.inputs t(association, :scope => 'fullstack.admin.resources', :default => association.to_s.humanize), :class => "associated-resource" do %>
+
+<%= f.admin_fields_for( association ) do |f| %>
+  <%= f.resource_inputs %>
+<% end %>
+
+<% end %>

data/fullstack-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-admin"
-  s.version = "0.1.42"
+  s.version = "0.1.43"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-09-04"
+  s.date = "2012-09-09"
   s.description = "Administration interface framework for fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [
@@ -985,6 +985,7 @@ Gem::Specification.new do |s|
     "app/views/admin/base/_associated_resources_table.html.erb",
     "app/views/admin/base/_form.html.erb",
     "app/views/admin/base/_index.html.erb",
+    "app/views/admin/base/_nested_belongs_to_fields.html.erb",
     "app/views/admin/base/_nested_form.html.erb",
     "app/views/admin/base/destroy.js.coffee",
     "app/views/admin/base/edit.html.erb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.42
+  version: 0.1.43
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1227,6 +1227,7 @@ files:
 - app/views/admin/base/_associated_resources_table.html.erb
 - app/views/admin/base/_form.html.erb
 - app/views/admin/base/_index.html.erb
+- app/views/admin/base/_nested_belongs_to_fields.html.erb
 - app/views/admin/base/_nested_form.html.erb
 - app/views/admin/base/destroy.js.coffee
 - app/views/admin/base/edit.html.erb
@@ -1317,7 +1318,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1212990792026625462
+      hash: 1840774875680029255
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: