Changeset 23

Timestamp:

11/04/2006 11:09:53 PM (2 years ago)

Author:

matthew

Message:

A bunch of things I should've committed separately as I did them... :)

* Added configuration option 'url_prefix', to override the default

'/admin' prefix in the automatic routes

* Added model method paginate_every(n): set default rows per page on

list view

* Added model method human_name(s): override the string used to refer to

the model in the interface

* Changed searching to use ILIKE instead of LIKE
* Added :link option to admin_child_table, to specify which (if any)

columns should have their value linked to the row's object

* Added Django table definition method delete_button(): adds a

JavaScript? 'delete' button to each row

* Changed static_text() presentation of boolean values; Django theme now

defaults to using icons

* Changed static_text() to use to_label instead of to_s

Files:

• trunk/auto-admin/init.rb (modified) (1 diff)
• trunk/auto-admin/lib/auto_admin_configuration.rb (modified) (7 diffs)
• trunk/auto-admin/lib/auto_admin_controller.rb (modified) (2 diffs)
• trunk/auto-admin/lib/auto_admin_django_theme.rb (modified) (3 diffs)
• trunk/auto-admin/lib/auto_admin_helper.rb (modified) (1 diff)
• trunk/auto-admin/lib/auto_admin_simple_theme.rb (modified) (6 diffs)
• trunk/auto-admin/themes/django/views/edit.rhtml (modified) (1 diff)
• trunk/auto-admin/themes/django/views/index.rhtml (modified) (1 diff)
• trunk/auto-admin/themes/django/views/layout.rhtml (modified) (1 diff)

trunk/auto-admin/init.rb

@@ -8 +8 @@
-  def draw_with_admin
-    draw_without_admin do |map|
-
-
+
+
+
-        :requirements => { :model => nil }
-'admin/asset/*path'
+"#{prefix}/asset/*path"
-
-'admin/:model/:action'
+"#{prefix}/:model/:action"
-        :requirements => { :action => /[^0-9].*/, :id => nil }
-'admin/:model/:id/:action'
+"#{prefix}/:model/:id/:action"
-        :requirements => { :id => /\d+/ }
-      yield map

trunk/auto-admin/lib/auto_admin_configuration.rb

@@ -30 +30 @@
-  def self.controller_super_class; @@controller_super_class ||= ActionController::Base; end
-  def self.controller_super_class=(klass); @@controller_super_class = klass; end
+  def self.url_prefix; @@url_prefix ||= 'admin'; end
+  def self.url_prefix= new_value; @@url_prefix = new_value; end
-  def self.model name
-    Object.const_get( name.to_s.camelcase )
@@ -52 +54 @@
-EVAL
-    end
+    def human_name(v=nil); @human_name = v if v; @human_name ||= name.titleize; end
+
-    def self.array_accessor *names
-      names.each {|name| defaulted_accessor name, '[]' }
@@ -157 +161 @@
-    def sort_reverse; defined?( @sort_column ) ? @sort_reverse : (default_sort_info[:reverse] rescue nil); end
-
+    def paginate_every(n=nil); @paginate = n if n; @paginate || 20; end
+
-    array_accessor :admin_fieldsets
-    def default_admin_fieldsets
@@ -242 +248 @@
-          1.upto blank_records do |n|
-            idx += 1
-
-
+
+
+
-          end
-        end
@@ -259 +266 @@
-
-      def build_object(builder, obj, idx, caption)
-
+
+
+
-          builder.fieldset( :fields, caption ) do
-            yield builder if block_given?
@@ -270 +279 @@
-        builder.fieldset( :table, name ) do
-          model = object.reflect_on_association( field ).klass
-
+
+
-            inner.outer do
-              inner.prologue do
@@ -289 +299 @@
-          conditions = options[:conditions] || []
-          conditions = [conditions] unless conditions.is_a? Array
-
+I
-          if conditions.size > 0
-            conditions[0] = "(#{conditions[0]}) AND (#{new_condition})"

trunk/auto-admin/lib/auto_admin_controller.rb

@@ -117 +117 @@
-      model.append_search_condition! params[:search], options
-    end
-20
+model.paginate_every
-    @pages, @objects = paginate(params[:model], options)
-    session[:admin_list_params] ||= {}
@@ -135 +135 @@
-
-      # Save attributes on the primary object
-
+
+
+
+
-        render :action => 'edit' and return
-      end
-
-
-
-
-
+
+
-      model.admin_fieldsets.each do |set|
-        case set.fieldset_type
-        when :tabular, :child_input
+          next if set.options[:read_only]
+
+          is_blank = lambda do |info|
+            if set.options[:blank]
+              case set.options[:blank]
+              when Hash
+                set.options[:blank].all? do |k,v|
+                  !info.include?(k) ||
+                    (Proc === v ? v.call(info[k]) : info[k] === v)
+                end
+              when Proc
+                set.options[:blank].call(info)
+              end
+            else
+              info.values.all? {|v| v.blank? }
+            end
+          end
+
-          children = @object.send( set.field )
-          child_class = children.build.class
-"#{params[:model]}_#{set.field}"
+set.field.to_s
-          child_params.each do |child_index, child_info|
+            child_info = child_info.dup
-            next unless Hash === child_info
-
-
+
+
+
+
+
+
+
-            unless o.update_attributes child_info
+              flash[:warning] = "Failed to #{o.new_record? ? 'add' : 'change'} the #{o.class.name.titleize.downcase} \"#{o.to_label}\" (#{set.label || 'Child list'}). "
-              render :action => 'edit' and return
-            end

trunk/auto-admin/lib/auto_admin_django_theme.rb

@@ -78 +78 @@
-      end
-    end
+    def static_text_without_theme(field, options = {})
+      v = @object.send(field)
+      if v == true || v == false
+        v = v ? 'Yes' : 'No'
+        helpers.send(:image_tag, helpers.send(:url_for, :escape => false, :action => :asset, :path => "images/auto_admin/icon-#{v.downcase}.gif" ), :alt => v, :title => v)
+      else
+        super
+      end
+    end
-  end
-  class TableBuilder < AutoAdmin::TableBuilder(FormBuilder)
@@ -97 +106 @@
-    def outer; %(<table cellspacing="0">); end
-    def fieldset(style, title=nil)
-first = true
+column_num = 0
-      super
+    end
+    def delete_button options={}
+      wrap_field :delete_button, nil, options do |*a|
+        <<-foo
+        <a href="#" onclick="this.getElementsByTagName('input')[0].value = 'DELETE'; this.parentNode.parentNode.style.display = 'none'; return false;">
+          <input type="hidden" value="" name="#{@object_name}[delete]" />
+          #{helpers.send(:image_tag, helpers.send(:url_for, :escape => false, :action => :asset, :path => "images/auto_admin/icon_deletelink.gif" ), :alt => ' [X]', :title => 'Delete')}
+        </a>
+        foo
+      end
-    end
-    def table_cell(field_type, field_name, options)
@@ -110 +129 @@
-              ''
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        link = link_to( yield, :action => 'edit', :model => model_name, :id => @object.id )
-        %(<th class="#{klass}">#{link}</th>)

trunk/auto-admin/lib/auto_admin_helper.rb

@@ -21 +21 @@
-  end
-  def human_model name=nil, pluralize=false
-
+human_
-    s = s.pluralize if pluralize && pluralize != 1
-.titleize
+
-  end
-

trunk/auto-admin/lib/auto_admin_simple_theme.rb

@@ -118 +118 @@
-  module PrivateFormHelpers
-    private
-
+, :link => 1
-    def option(opt_name)
-DEFAULT_OPTIONS.include?( opt_name ) ? DEFAULT_OPTIONS[opt_name] : @options
+(@options && @options.include?( opt_name )) ? @options[opt_name] : DEFAULT_OPTIONS
-    end
-    def model
@@ -239 +239 @@
-      end
-    end
-
+, object_name=@object_name
-      previous_object, @object = @object, object
+      previous_object_name, @object_name = @object_name, object_name
-      yield
-
+
+
-    end
-
@@ -325 +327 @@
-    end
-    def static_text(field, options = {})
-
+
+
-    end
-    def calculated_text(options = {}) # :yields: object
-
+
+
-    end
-    def static_html(field, options = {})
@@ -391 +395 @@
-      yield self.class.new( inner_object, name, extra_options[:model], @controller, table_params, options ) if table_params
-    end
-
+, object_name=@object_name
-      previous_object, @object = @object, object
+      previous_object_name, @object_name = @object_name, object_name
-      yield
-
+
+
-    end
-
@@ -484 +490 @@
-        def #{helper}(options={}, *args, &proc)
-          wrap_field #{helper.to_sym.inspect}, nil, options do |*a|
-super(options, *args, &proc) : super
+#{helper}_without_theme(options, *args, &proc) : #{helper}_without_theme
-          end
-        end
@@ -494 +500 @@
-        def #{helper}(field, options={}, *args, &proc)
-          wrap_field #{helper.to_sym.inspect}, field, options do |*a|
-super(field, options, *args, &proc) : super
+#{helper}_without_theme(field, options, *args, &proc) : #{helper}_without_theme
-          end
-        end

trunk/auto-admin/themes/django/views/edit.rhtml

@@ -2 +2 @@
-@body_class = 'change-form'
-@content_class = 'colM'
-params[:model].humanize.downcase}" : "Change #{params[:model].humanize
+human_model.downcase}" : "Change #{human_model
-@tools = []
-@tools << link_to( "History", { :model => params[:model], :action => 'history', :id => params[:id] } ) if has_history?

trunk/auto-admin/themes/django/views/index.rhtml

@@ -12 +12 @@
-  o = obj.name.underscore
-  %>
-.humaniz
+bj.human_nam
-      <td><%= link_to 'Add', { :model => o, :action => 'edit' }, { :class => 'addlink' } %></td>
-      <td><%= link_to 'Change', list_page_for( o ), { :class => 'changelink' } %></td></tr>

trunk/auto-admin/themes/django/views/layout.rhtml

@@ -35 +35 @@
-        crumbs = [link_to( 'Home', :controller => 'auto_admin')]
-        if params[:action] == 'list'
-params[:model].pluralize.humanize
+human_model(nil, true)
-        else
-params[:model].pluralize.humanize
-
+human_model(nil, true)
+!@object.new_record? && 
-        end
-      else