ajax_scaffold_plugin 3.2.1 → 3.2.2

data/app/views/ajax_scaffold/_column_headings.rhtml

@@ -17,4 +17,6 @@
    <% end %>
  </th>
 <% end %>
-<th></th>
+<% unless @no_edit && @no_delete %>
+ <th></th>
+<% end %>

data/lib/ajax_scaffold_plugin.rb

@@ -130,7 +130,7 @@ module AjaxScaffold # :nodoc:
       # set up a few variables for use in the code generation
       singular_name   = model_id.to_s
       class_name      = options[:class_name] || singular_name.camelize
-      plural_name     = singular_name.pluralize
+      plural_name     = eval("#{class_name}.table_name") || singular_name.pluralize
       rows_per_page   = options[:rows_per_page] || 25
       suffix          = options[:suffix] ? "_#{singular_name}" : ""
       prefix          = options[:suffix] ? "#{plural_name}_" : ""
@@ -138,8 +138,8 @@ module AjaxScaffold # :nodoc:
       width           = options[:width].nil? ? (options[:rel_width].nil? ? nil : options[:rel_width]*100 ) : options[:width]
 
       if (!width.nil?)
-         dimensions = options[:width].nil? ? "%" : "px"
-         width = width.to_s + dimensions
+        dimensions = options[:width].nil? ? "%" : "px"
+        width = width.to_s + dimensions
       end
 
       no_create, no_edit, no_delete = false, false, false
@@ -242,9 +242,7 @@ module AjaxScaffold # :nodoc:
       unless (no_create)
         module_eval <<-"end_eval", __FILE__, __LINE__
           def new#{suffix}
-            @#{singular_name} = #{class_name}.new
-            @successful = true
-
+            do_new#{suffix}
             return render#{suffix}_template(:action => 'new.rjs') if request.xhr?
 
             # Javascript disabled fallback
@@ -256,6 +254,11 @@ module AjaxScaffold # :nodoc:
             end
           end
 
+          def do_new#{suffix}
+            @#{singular_name} = #{class_name}.new
+            @successful = true
+          end
+
           def create#{suffix}
             begin
               do_create#{suffix}
@@ -284,8 +287,7 @@ module AjaxScaffold # :nodoc:
         module_eval <<-"end_eval", __FILE__, __LINE__
           def edit#{suffix}
             begin
-              @#{singular_name} = #{class_name}.find(params[:id])
-              @successful = !@#{singular_name}.nil?
+              do_edit#{suffix}
             rescue
               flash[:error], @successful  = $!.to_s, false
             end
@@ -299,6 +301,11 @@ module AjaxScaffold # :nodoc:
               #{prefix}return_to_main
             end
           end
+          
+          def do_edit#{suffix}
+            @#{singular_name} = #{class_name}.find(params[:id])
+            @successful = !@#{singular_name}.nil?
+          end
 
           def update#{suffix}
             begin
@@ -328,7 +335,7 @@ module AjaxScaffold # :nodoc:
         module_eval <<-"end_eval", __FILE__, __LINE__
           def destroy#{suffix}
             begin
-              @successful = #{class_name}.find(params[:id]).destroy
+              do_destroy#{suffix}
             rescue
               flash[:error], @successful  = $!.to_s, false
             end
@@ -338,6 +345,10 @@ module AjaxScaffold # :nodoc:
             # Javascript disabled fallback
             #{prefix}return_to_main
           end
+          
+          def do_destroy#{suffix}            
+            @successful = #{class_name}.find(params[:id]).destroy
+          end
         end_eval
       end
 
@@ -496,7 +507,7 @@ module ::ActionView #:nodoc:
     module AssetTagHelper
       # produces all the includes in one shot
       def ajax_scaffold_includes
-        js = javascript_include_tag(:defaults, 'dhtml_history', 'rico_corner', 'ajax_scaffold')
+        js = javascript_include_tag(:defaults, 'rico_corner', 'ajax_scaffold', 'dhtml_history')
         css = stylesheet_link_tag('ajax_scaffold')
         js + "\n" + css
       end

data/public/javascripts/dhtml_history.js

@@ -922,11 +922,11 @@ window.dhtmlHistory.create();
 
 /** Create init methods for ajax_table */
 function initialize() {
-       // initialize our DHTML history
-       dhtmlHistory.initialize();
-       // subscribe to DHTML history change
-       // events
-       dhtmlHistory.addListener(handleHistoryChange);        
+  // initialize our DHTML history
+  dhtmlHistory.initialize();
+  // subscribe to DHTML history change
+  // events
+  dhtmlHistory.addListener(handleHistoryChange);        
 }
     
 /** Our callback to receive history 

data/public/stylesheets/ajax_scaffold.css

@@ -20,6 +20,10 @@ padding: 0;
 margin: 5px 0;
 }
 
+* html .ajax-scaffold {
+height: 1%;
+}
+
 .ajax-scaffold table {
 width: 100%;
 }

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ajax_scaffold_plugin
 version: !ruby/object:Gem::Version 
-  version: 3.2.1
-date: 2006-09-19 00:00:00 -06:00
+  version: 3.2.2
+date: 2006-10-03 00:00:00 +01:00
 summary: Ajax Scaffold plugin is a rails plugin for ajaxified scaffolds
 require_paths: 
 - lib
@@ -36,14 +36,6 @@ files:
 - app/
 - app/views
 - app/views/ajax_scaffold
-- app/views/ajax_scaffold/_row.rhtml
-- app/views/ajax_scaffold/_pagination_links.rhtml
-- app/views/ajax_scaffold/_new_edit.rhtml
-- app/views/ajax_scaffold/_messages.rhtml
-- app/views/ajax_scaffold/_form_messages.rhtml
-- app/views/ajax_scaffold/_form.rhtml
-- app/views/ajax_scaffold/_column_totals.rhtml
-- app/views/ajax_scaffold/_column_headings.rhtml
 - app/views/ajax_scaffold/update.rjs
 - app/views/ajax_scaffold/table.rhtml
 - app/views/ajax_scaffold/new.rjs
@@ -52,6 +44,16 @@ files:
 - app/views/ajax_scaffold/destroy.rjs
 - app/views/ajax_scaffold/create.rjs
 - app/views/ajax_scaffold/cancel.rjs
+- app/views/ajax_scaffold/_row.rhtml
+- app/views/ajax_scaffold/_pagination_links.rhtml
+- app/views/ajax_scaffold/_new_edit.rhtml
+- app/views/ajax_scaffold/_messages.rhtml
+- app/views/ajax_scaffold/_form_messages.rhtml
+- app/views/ajax_scaffold/_form.rhtml
+- app/views/ajax_scaffold/_column_totals.rhtml
+- app/views/ajax_scaffold/_column_headings.rhtml
+- app/views/.DS_Store
+- app/.DS_Store
 - lib/
 - lib/base
 - lib/base/ajax_scaffold.rb
@@ -69,7 +71,9 @@ files:
 - public/images/arrow_up.gif
 - public/images/arrow_down.gif
 - public/images/add.gif
+- public/images/.DS_Store
 - public/blank.html
+- public/.DS_Store
 - tasks/
 - tasks/ajax_scaffold_tasks.rake
 - test/