[Jifty-commit] r3848 - in jifty/trunk: lib/Jifty/Action lib/Jifty/Plugin lib/Jifty/Plugin/Image lib/Jifty/View/Declare

[jifty-commit at lists.jifty.org]

Author: clkao
Date: Sat Aug 11 03:48:56 2007
New Revision: 3848

Added:
   jifty/trunk/lib/Jifty/Plugin/Image/
      - copied from r3667, /jifty/trunk/lib/Jifty/Plugin/Userpic/
   jifty/trunk/lib/Jifty/Plugin/Image.pm
      - copied unchanged from r3667, /jifty/trunk/lib/Jifty/Plugin/Userpic.pm
Modified:
   jifty/trunk/lib/Jifty/Action/Record.pm
   jifty/trunk/lib/Jifty/View/Declare/CRUD.pm
   jifty/trunk/share/plugins/Jifty/Plugin/GoogleMap/web/static/js/google_map.js

Log:
Follow up to r3839, do not change the logic if refers_to is not jifty::record

Modified: jifty/trunk/lib/Jifty/Action/Record.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Action/Record.pm	(original)
+++ jifty/trunk/lib/Jifty/Action/Record.pm	Sat Aug 11 03:48:56 2007
@@ -199,7 +199,7 @@
                     $info->{render_as} = $render_as || 'Select';
                 }
 
-                if ( $info->{render_as} eq 'Select' ) {
+                if ( UNIVERSAL::isa( $refers_to, 'Jifty::Record' ) && $info->{render_as} eq 'Select' ) {
                     my $collection = Jifty::Collection->new(
                         record_class => $refers_to,
                         current_user => $self->record->current_user

Modified: jifty/trunk/lib/Jifty/View/Declare/CRUD.pm
==============================================================================
--- jifty/trunk/lib/Jifty/View/Declare/CRUD.pm	(original)
+++ jifty/trunk/lib/Jifty/View/Declare/CRUD.pm	Sat Aug 11 03:48:56 2007
@@ -430,11 +430,13 @@
     my $self        = shift;
     my $collection  = shift;
     my $item_path   = shift;
+    my $callback    = shift;
     my $object_type = $self->object_type;
     if ( $collection->pager->total_entries == 0 ) {
         show('./no_items_found');
     }
 
+    my $i = 0;
     div {
         { class is 'list' };
         while ( my $item = $collection->next ) {
@@ -443,6 +445,7 @@
                 path     => $item_path,
                 defaults => { id => $item->id, object_type => $object_type }
             );
+            $callback->(++$i) if $callback;
         }
     };
 

Modified: jifty/trunk/share/plugins/Jifty/Plugin/GoogleMap/web/static/js/google_map.js
==============================================================================
--- jifty/trunk/share/plugins/Jifty/Plugin/GoogleMap/web/static/js/google_map.js	(original)
+++ jifty/trunk/share/plugins/Jifty/Plugin/GoogleMap/web/static/js/google_map.js	Sat Aug 11 03:48:56 2007
@@ -111,7 +111,6 @@
       };
       element.appendChild(field);
       var submit= document.createElement('input');
-      submit.id = 'blahblah';
       submit.value = 'Query';
       submit.setAttribute('type', 'button');
       submit.onclick = function() { _handle_search(map, field.value) };