sferik-merb-admin 0.2.8 → 0.3.0

data/README.markdown

@@ -14,7 +14,7 @@ At the command prompt, type:
 
 In your app, add the following dependency to `config/dependencies.rb`:
 
-    dependency "sferik-merb-admin", "0.2.8", :require_as => "merb-admin"
+    dependency "sferik-merb-admin", "0.3.0", :require_as => "merb-admin"
     dependency "dm-is-paginated", "0.0.1" # if you want pagination support
 
 Add the following route to `config/router.rb`:

data/Rakefile

@@ -12,7 +12,7 @@ AUTHOR = "Erik Michaels-Ober"
 EMAIL = "sferik@gmail.com"
 HOMEPAGE = "http://twitter.com/sferik"
 SUMMARY = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
-GEM_VERSION = "0.2.8"
+GEM_VERSION = "0.3.0"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"

data/app/controllers/main.rb

@@ -54,7 +54,7 @@ class MerbAdmin::Main < MerbAdmin::Application
     object = params[@abstract_model.singular_name] || {}
     # Delete fields that are blank
     object.each do |key, value|
-      object.delete(key) if value.blank?
+      object[key] = nil if value.blank?
     end
     associations = @abstract_model.has_many_associations.map{|association| [association, (params[:associations] || {}).delete(association[:name])]}
     @object = @abstract_model.new(object)
@@ -76,7 +76,7 @@ class MerbAdmin::Main < MerbAdmin::Application
     object = params[@abstract_model.singular_name] || {}
     # Delete fields that are blank
     object.each do |key, value|
-      object.delete(key) if value.blank?
+      object[key] = nil if value.blank?
     end
     associations = @abstract_model.has_many_associations.map{|association| [association, (params[:associations] || {}).delete(association[:name])]}
     if @object.update_attributes(object) && associations.each{|association, ids| update_has_many_association(association, ids)}
@@ -146,7 +146,7 @@ class MerbAdmin::Main < MerbAdmin::Application
     conditions = []
     @properties.each do |property|
       next unless property[:type] == :string
-      condition_statement << "#{property[:field]} LIKE ?"
+      condition_statement << "#{property[:name]} LIKE ?"
       conditions << "%#{params[:query]}%"
     end
     conditions.unshift(condition_statement.join(" OR "))

data/app/views/main/_belongs_to.html.erb

@@ -0,0 +1,23 @@
+            <fieldset class="module aligned">
+              <h2><%= association[:pretty_name].capitalize %></h2>
+              <div class="<%= @object.errors[association[:child_key].first] ? "form-row errors" : "form-row"%>">
+                <% if @object.errors[association[:child_key].first] %>
+                <ul class="errorlist">
+                  <% @object.errors[association[:child_key].first].each do |error| %>
+                  <li><%= error %></li>
+                  <% end %>
+                </ul>
+                <% end %>
+                <div>
+                  <%= select(association[:child_key].first, :collection => MerbAdmin::AbstractModel.new(association[:parent_model]).find_all.map{|o| [o.id, object_title(o)]}.sort_by{|o| o[1]}, :include_blank => true, :selected => @object.send(association[:child_key].first).to_s, :label => association[:pretty_name].capitalize) %>
+                  <p class="help">
+                    <% required = false %>
+                    <% @properties.each do |property| %>
+                    <% next unless property[:name] == association[:child_key].first %>
+                    <% required = true unless property[:nullable?] %>
+                    <% end %>
+                    <%= required ? "Required." : "Optional." %>
+                  </p>
+                </div>
+              </div>
+            </fieldset>

data/app/views/main/edit.html.erb

@@ -7,8 +7,10 @@
         <%= form_for(@object, :action => slice_url(:admin_update, :model_name => @abstract_model.singular_name, :id => @object.id)) do %>
           <div>
             <fieldset class="module aligned">
+              <% belongs_to_keys = @abstract_model.belongs_to_associations.map{|b| b[:child_key].first} %>
               <% @properties.each do |property| %>
-              <% next if [:id, :created_at, :created_on, :updated_at, :updated_on].include?(property[:name]) %>
+              <% next if [:id, :created_at, :created_on, :deleted_at, :updated_at, :updated_on, :deleted_on].include?(property[:name]) %>
+              <% next if belongs_to_keys.include?(property[:name]) %>
               <div class="<%= @object.errors[property[:name]] ? "form-row errors" : "form-row"%>">
                 <% if @object.errors[property[:name]] %>
                 <ul class="errorlist">
@@ -21,8 +23,11 @@
               </div>
               <% end %>
             </fieldset>
+            <% @abstract_model.belongs_to_associations.each do |association| %>
+<%= partial('belongs_to', :association => association) -%>
+            <% end %>
             <% @abstract_model.has_many_associations.each do |association| %>
-<%= partial('has_many', :association => association) %>
+<%= partial('has_many', :association => association) -%>
             <% end %>
             <div class="submit-row" >
               <%= submit "Save", :class => "default", :name => "_save" %>

data/app/views/main/new.html.erb

@@ -2,8 +2,10 @@
         <%= form_for(@object, :action => slice_url(:admin_create, :model_name => @abstract_model.singular_name)) do %>
           <div>
             <fieldset class="module aligned">
+              <% belongs_to_keys = @abstract_model.belongs_to_associations.map{|b| b[:child_key].first} %>
               <% @properties.each do |property| %>
-                <% next if [:id, :created_at, :created_on, :updated_at, :updated_on].include?(property[:name]) %>
+              <% next if [:id, :created_at, :created_on, :deleted_at, :updated_at, :updated_on, :deleted_on].include?(property[:name]) %>
+              <% next if belongs_to_keys.include?(property[:name]) %>
               <div class="<%= @object.errors[property[:name]] ? "form-row errors" : "form-row"%>">
                 <% if @object.errors[property[:name]] %>
                 <ul class="errorlist">
@@ -16,8 +18,11 @@
               </div>
               <% end %>
             </fieldset>
+            <% @abstract_model.belongs_to_associations.each do |association| %>
+<%= partial('belongs_to', :association => association) -%>
+            <% end %>
             <% @abstract_model.has_many_associations.each do |association| %>
-<%= partial('has_many', :association => association) %>
+<%= partial('has_many', :association => association) -%>
             <% end %>
             <div class="submit-row" >
               <%= submit "Save", :class => "default", :name => "_save" %>

data/lib/abstract_model.rb

@@ -97,9 +97,9 @@ module MerbAdmin
             :pretty_name => name.to_s.gsub('_', ' '),
             :type => association_type_lookup(relationship),
             :parent_model => relationship.parent_model,
-            :parent_key => relationship.parent_key.map{|p| p.name},
+            :parent_key => relationship.parent_key.map{|r| r.name},
             :child_model => relationship.child_model,
-            :child_key => relationship.child_key.map{|p| p.name},
+            :child_key => relationship.child_key.map{|r| r.name},
             :remote_relationship => relationship.options[:remote_relationship_name],
             :near_relationship => relationship.options[:near_relationship_name],
           }
@@ -117,12 +117,11 @@ module MerbAdmin
           {
             :name => property.name,
             :pretty_name => property.field.gsub('_', ' '),
+            :type => type_lookup(property),
+            :length => property.length,
             :nullable? => property.nullable?,
             :serial? => property.serial?,
             :key? => property.key?,
-            :field => property.field,
-            :length => property.length,
-            :type => type_lookup(property),
             :flag_map => property.type.respond_to?(:flag_map) ? property.type.flag_map : nil,
           }
         end

data/lib/merb-admin.rb

@@ -23,7 +23,7 @@ if defined?(Merb::Plugins)
 
     # Slice metadata
     self.description = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
-    self.version = "0.2.8"
+    self.version = "0.3.0"
     self.author = "Erik Michaels-Ober"
 
     # Stub classes loaded hook - runs before LoadClasses BootLoader

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sferik-merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -86,6 +86,7 @@ files:
 - app/views/layout/form.html.erb
 - app/views/layout/list.html.erb
 - app/views/main
+- app/views/main/_belongs_to.html.erb
 - app/views/main/_big_decimal.html.erb
 - app/views/main/_boolean.html.erb
 - app/views/main/_date.html.erb