From a6f9b6b630ade678a3af8cf7f3642a82ae4904e0 Mon Sep 17 00:00:00 2001
From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Fri, 25 Jun 2010 01:11:11 +0200
Subject: [PATCH] we really need separate on_path for apply

---
 lib/MojoFacets/Changes.pm       | 29 +++++++++++++++++------------
 templates/changes/index.html.ep |  8 ++++----
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/lib/MojoFacets/Changes.pm b/lib/MojoFacets/Changes.pm
index 8b4cab8..fc664fb 100644
--- a/lib/MojoFacets/Changes.pm
+++ b/lib/MojoFacets/Changes.pm
@@ -18,17 +18,17 @@ sub _changes_path {
 sub index {
 	my ( $self ) = @_;
 	my $path = $self->param('path') || $self->session('path');
+	my $on_path = $self->param('on_path');
 	my $commit = $self->param('commit');
 	my ( $items, $unique2id );
-	if ( $path ) {
-		$items = $MojoFacets::Data::loaded->{$path}->{data}->{items};
+	if ( $on_path ) {
+		$items = $MojoFacets::Data::loaded->{$on_path}->{data}->{items};
 		if ( ! $items ) {
-			warn "$path not loaded";
-			$self->session('path', $path);
-			$self->redirect_to('/data/index');
+			warn "$on_path not loaded";
+			$self->redirect_to('/data/index?path=' . $on_path);
 			return;
 		}
-		warn "using $items for $path\n";
+		warn "using ", $#$items + 1, " items from $on_path\n";
 	}
 	my $invalidate_columns;
 	my $changes;
@@ -68,14 +68,14 @@ sub index {
 				my $commit_changed;
 				my $t = time();
 				foreach my $i ( 0 .. $#$items ) {
-					MojoFacets::Data::__commit_path_code( $path, $i, $code, \$commit_changed );
+					MojoFacets::Data::__commit_path_code( $on_path, $i, $code, \$commit_changed );
 				}
 				$t = time() - $t;
 				$self->stash( 'commit_changed', $commit_changed );
 				warn "commit_changed in $t s ",dump( $e->{commit_changed}, $commit_changed );
 				$e->{commit_changed_this} = $commit_changed;
-				MojoFacets::Data::__invalidate_path_column( $path, $_ ) foreach keys %$commit_changed;
-				MojoFacets::Data::__path_rebuild_stats( $path );
+				MojoFacets::Data::__invalidate_path_column( $on_path, $_ ) foreach keys %$commit_changed;
+				MojoFacets::Data::__path_rebuild_stats( $on_path );
 			}
 			$stats->{code}++;
 		} else {
@@ -86,15 +86,20 @@ sub index {
 	}
 
 	foreach my $name ( keys %$invalidate_columns ) {
-		MojoFacets::Data::__invalidate_path_column( $path, $name );
+		MojoFacets::Data::__invalidate_path_column( $on_path, $name );
 	}
 
-	MojoFacets::Data::__path_modified( $path );
+	MojoFacets::Data::__path_modified( $on_path );
 
 	my @loaded = MojoFacets::Data::__loaded_paths();
 	warn "# loaded paths ",dump @loaded;
 
-	$self->render( path => $path, changes => $changes, loaded => \@loaded, stats => $stats );
+	$self->render(
+		on_path => $on_path || $path,
+		changes => $changes,
+		loaded => \@loaded,
+		stats => $stats,
+	);
 }
 
 sub remove {
diff --git a/templates/changes/index.html.ep b/templates/changes/index.html.ep
index 487ba4a..63deb8b 100644
--- a/templates/changes/index.html.ep
+++ b/templates/changes/index.html.ep
@@ -4,9 +4,9 @@
 
 <form method=post>
 <input name=apply type=submit value="Apply"> on
-<select name=path>
+<select name=on_path>
 % foreach my $p ( @$loaded ) {
-<option<%= $p eq $path ? ' selected' : '' %>><%= $p %></option>
+<option<%= $p eq $on_path ? ' selected' : '' %>><%= $p %></option>
 % }
 </select>
 
@@ -14,7 +14,7 @@
 
 <label><input type=checkbox name=dump <%= $dump ? 'checked' : '' %>>dump</label>
 
-% if ( $path ) {
+% if ( $on_path ) {
 <ul id=status>
 %  foreach my $status ( keys %$stats ) {
 <li><label>
@@ -29,7 +29,7 @@
 <input type=submit name=commit value="Commit changes">
 %  } elsif ( param('commit') ) {
 <b>
-Changes commited to <a href="<%= url_for( controller => 'data', action => 'items' )->query( path => $path ) %>"><%= $path %></a>
+Changes commited to <a href="<%= url_for( controller => 'data', action => 'items' )->query( path => $on_path ) %>"><%= $on_path %></a>
 </b>
 <pre><%= dumper stash('commit_changed') %></pre>
 %  }
-- 
2.20.1