--- lib/Arh/View/UnitPictures.pm	2008/04/06 16:09:03	48
+++ lib/Arh/View/UnitPictures.pm	2008/04/06 18:17:42	50
@@ -8,7 +8,7 @@
 
 use Data::Dump qw/dump/;
 
-sub object_type { 'UnitPicture' };
+sub object_type { 'Picture' };
 
 private template search_region => sub {};
 private template 'no_items_found' => sub {};
@@ -77,8 +77,8 @@
 				},
 			));
 		};
-		img { attr { src => "/static/pics/" . $record->picture->filename } }
-		tt{ $record->picture->filename }
+		img { attr { src => "/raw_pic?image=" . $record->filename } }
+		tt{ $record->filename }
 	}; 
 
 };
@@ -88,14 +88,11 @@
 	return unless $self->current_user->editing;
 
 	my ( $id, $unit ) = get(qw(id unit));
-	warn "## unit $id $unit";
+	warn "## new_picture id: $id unit: $unit";
 
-#	my $record_class = $self->record_class;
-#	warn "## new_picture record_class: $record_class\n";
-#	my $create = $record_class->as_create_action(
-
-	my $create = new_action(
-		class => 'UploadPicture',
+	my $record_class = $self->record_class;
+	warn "## new_picture record_class: $record_class\n";
+	my $create = $record_class->as_create_action(
 		moniker => "create-" . Jifty->web->serial,
 	);
 
@@ -108,13 +105,16 @@
 
     form {
 		render_action( $create => [ 'campaign', 'content', 'type' ] );
-		outs_raw( $create->hidden( unit => $unit ) );
 		hyperlink(
 			label   => _("Add picture"),
 			class   => "float-crud-button button-add",
 			onclick => [
 				{
 					submit => $create,
+					args => {
+						picture => { result_of => $picture, name => 'id' },
+						unit => $unit,
+					}
 				},
 				{	refresh_self => 1	},
 				{
@@ -137,7 +137,7 @@
 
 	#warn "## unit = ", dump( $unit );
 
-	my $unitpictures = Arh::Model::UnitPictureCollection->new;
+	my $unitpictures = Arh::Model::PictureCollection->new;
 	$unitpictures->limit( column => 'unit', value => $unit->id );
 	warn "## ", $unitpictures->count, " pictures for unit ",$unit->id;
 
@@ -146,20 +146,21 @@
 
 		if ( $unitpictures->count ) {
 			em { _('Pictures for unit'), ' ', $unit->name };
+
+			set( search_collection => $unitpictures );
+			render_region(
+				name => 'unit-pictures',
+				path => '/unitpictures/list',
+				defaults => {
+					page => 1,
+					unit => $unit->id,
+				}
+			);
+
 		} else {
 			em { _('No pictures for unit'), ' ', $unit->name };
 		}
 
-		set( search_collection => $unitpictures );
-		render_region(
-			name => 'unit-pictures',
-			path => '/unitpictures/list',
-			defaults => {
-				page => 1,
-				unit => $unit->id,
-			}
-		);
-
 	}
 };