sferik-merb-admin 0.2.0 → 0.2.1

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.0", :require_as => "merb-admin"
+    dependency "sferik-merb-admin", "0.2.1", :require_as => "merb-admin"
 
 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 slice that provides an easy-to-use interface for managing your data."
-GEM_VERSION = "0.2.0"
+GEM_VERSION = "0.2.1"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"

data/app/controllers/forms.rb

@@ -71,11 +71,11 @@ class MerbAdmin::Forms < MerbAdmin::Application
     @instance = @model.new(instance)
     if @instance.save
       if params[:_continue]
-        redirect slice_url(:admin_edit, :model_name => @model_name.snake_case, :id => @instance.id), :message => {:notice => "#{@model_name} was successfully created"}
+        redirect(slice_url(:admin_edit, :model_name => @model_name.snake_case, :id => @instance.id), :message => {:notice => "#{@model_name} was successfully created"})
       elsif params[:_add_another]
-        redirect slice_url(:admin_new, :model_name => @model_name.snake_case), :message => {:notice => "#{@model_name} was successfully created"}
+        redirect(slice_url(:admin_new, :model_name => @model_name.snake_case), :message => {:notice => "#{@model_name} was successfully created"})
       else
-        redirect slice_url(:admin_list, :model_name => @model_name.snake_case), :message => {:notice => "#{@model_name} was successfully created"}
+        redirect(slice_url(:admin_list, :model_name => @model_name.snake_case), :message => {:notice => "#{@model_name} was successfully created"})
       end
     else
       message[:error] = "#{@model_name} failed to be created"
@@ -89,11 +89,11 @@ class MerbAdmin::Forms < MerbAdmin::Application
     raise NotFound unless @instance
     if @instance.update_attributes(instance)
       if params[:_continue]
-        redirect slice_url(:admin_edit, :model_name => @model_name.snake_case, :id => @instance.id), :message => {:notice => "#{@model_name} was successfully updated"}
+        redirect(slice_url(:admin_edit, :model_name => @model_name.snake_case, :id => @instance.id), :message => {:notice => "#{@model_name} was successfully updated"})
       elsif params[:_add_another]
-        redirect slice_url(:admin_new, :model_name => @model_name.snake_case), :message => {:notice => "#{@model_name} was successfully updated"}
+        redirect(slice_url(:admin_new, :model_name => @model_name.snake_case), :message => {:notice => "#{@model_name} was successfully updated"})
       else
-        redirect slice_url(:admin_list, :model_name => @model_name.snake_case), :message => {:notice => "#{@model_name} was successfully updated"}
+        redirect(slice_url(:admin_list, :model_name => @model_name.snake_case), :message => {:notice => "#{@model_name} was successfully updated"})
       end
     else
       message[:error] = "#{@model_name} failed to be updated"
@@ -111,7 +111,7 @@ class MerbAdmin::Forms < MerbAdmin::Application
     @instance = @model.get(id)
     raise NotFound unless @instance
     if @instance.destroy
-      redirect slice_url(:admin_list, :model_name => @model_name.snake_case), :message => {:notice => "#{@model_name} was successfully destroyed"}
+      redirect(slice_url(:admin_list, :model_name => @model_name.snake_case), :message => {:notice => "#{@model_name} was successfully destroyed"})
     else
       raise InternalServerError
     end

data/app/views/forms/_date.html.erb

@@ -1,6 +1,7 @@
+<% value = eval("@instance.#{property.field}") %>
               <div class="form-row page">
                 <div>
-                  <%= text_field(property.name, :class => "vDateField", :label => property.field.capitalize.gsub('_', ' '), :value => eval("@instance.#{property.field}").strftime("%Y-%m-%d")) %>
+                  <%= text_field(property.name, :class => "vDateField", :label => property.field.capitalize.gsub('_', ' '), :value => value.respond_to?(:strftime) ? value.strftime("%Y-%m-%d") : nil) %>
                   <p class="help">
                     <%= !property.nullable? ? "Required." : "Optional." %>
                   </p>

data/app/views/forms/_date_time.html.erb

@@ -1,6 +1,7 @@
+<% value = eval("@instance.#{property.field}") %>
               <div class="form-row page">
                 <div>
-                  <%= text_field(property.name, :class => "vDateField", :label => property.field.capitalize.gsub('_', ' '), :value => eval("@instance.#{property.field}").strftime("%Y-%m-%d %H:%M:%S")) %>
+                  <%= text_field(property.name, :class => "vDateField", :label => property.field.capitalize.gsub('_', ' '), :value => value.respond_to?(:strftime) ? value.strftime("%Y-%m-%d %H:%M:%S") ? nil) %>
                   <p class="help">
                     <%= !property.nullable? ? "Required." : "Optional." %>
                   </p>

data/app/views/forms/_time.html.erb

@@ -1,6 +1,7 @@
+<% value = eval("@instance.#{property.field}") %>
               <div class="form-row page">
                 <div>
-                  <%= text_field(property.name, :class => "vTimeField", :label => property.field.capitalize.gsub('_', ' '), :value => eval("@instance.#{property.field}").strftime("%H:%M:%S")) %>
+                  <%= text_field(property.name, :class => "vTimeField", :label => property.field.capitalize.gsub('_', ' '), :value => value.respond_to?(:strftime) ? value.strftime("%H:%M:%S") : nil) %>
                   <p class="help">
                     <%= !property.nullable? ? "Required." : "Optional." %>
                   </p>

data/app/views/forms/list.html.erb

@@ -79,11 +79,14 @@
                       <img alt="False" src="<%= image_path("icon-no.gif") %>"/>
                       <% end %>
                       <% when "DateTime" %>
-                      <%= eval("instance.#{property.field}").strftime("%b. %d, %Y, %I:%M%p") %>
+                        <% value = eval("instance.#{property.field}") %>
+                      <%= value.respond_to?(:strftime) ? value.strftime("%b. %d, %Y, %I:%M%p") : nil %>
                       <% when "Date" %>
-                      <%= eval("instance.#{property.field}").strftime("%b. %d, %Y") %>
+                        <% value = eval("instance.#{property.field}") %>
+                      <%= value.respond_to?(:strftime) ? value.strftime("%b. %d, %Y") : nil %>
                       <% when "Time" %>
-                      <%= eval("instance.#{property.field}").strftime("%I:%M%p") %>
+                        <% value = eval("instance.#{property.field}") %>
+                      <%= value.respond_to?(:strftime) ? value.strftime("%I:%M%p") : nil %>
                       <% when "Integer" %>
                       <% if property.type.respond_to?(:flag_map) #Enum or Flag type %>
                       <%= eval("instance.#{property.field}").to_s.capitalize.gsub('_', ' ') %>

data/lib/merb-admin.rb

@@ -22,7 +22,7 @@ if defined?(Merb::Plugins)
     
     # Slice metadata
     self.description = "MerbAdmin is a merb slice that uses your DataMapper models to provide an easy-to-use, Django-style interface for content managers."
-    self.version = "0.2.0"
+    self.version = "0.2.1"
     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.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Erik Michaels-Ober