[interchange-cvs] interchange - racke modified 3 files

interchange-core@interchange.redhat.com interchange-core@interchange.redhat.com
Mon Jun 3 10:03:01 2002


User:      racke
Date:      2002-06-03 14:02:26 GMT
Modified:  .        Tag: STABLE_4_8-branch WHATSNEW
Modified:  dist/lib/UI/pages/admin Tag: STABLE_4_8-branch
Modified:           access_permissions.html
Modified:  dist/lib/UI/usertag Tag: STABLE_4_8-branch db_hash.tag
Log:
Owner field in the permission editor didn't propagate to the database.

Revision  Changes    Path
No                   revision



No                   revision



2.6.2.60  +3 -1      interchange/WHATSNEW


rev 2.6.2.60, prev_rev 2.6.2.59
Index: WHATSNEW
===================================================================
RCS file: /anon_cvs/repository/interchange/WHATSNEW,v
retrieving revision 2.6.2.59
retrieving revision 2.6.2.60
diff -u -r2.6.2.59 -r2.6.2.60
--- WHATSNEW	24 May 2002 21:02:31 -0000	2.6.2.59
+++ WHATSNEW	3 Jun 2002 14:02:25 -0000	2.6.2.60
@@ -41,6 +41,8 @@
 * Added capability to page editor to cope with any ITL page instead of only
   the ones derived from the foundation demo.
 
+* Owner field in the permission editor didn't propagate to the database.
+
 * Fixed a bug in the permission check in the order resp. traffic
   statistics pages.
 
@@ -66,7 +68,7 @@
   to do those things.
 
 * Check for demo catalog added in interchange-ui's postinst (fixes Debian
-  bug #147705). Fixes inaccesible demo catalog if only interchange-ui is
+  bug #147705). Fixes inaccessible demo catalog if only interchange-ui is
   upgraded.
 
 * Turned Depends of the libapache-mod-interchange Debian package on 



No                   revision



No                   revision



2.1.2.3   +15 -6     interchange/dist/lib/UI/pages/admin/access_permissions.html


rev 2.1.2.3, prev_rev 2.1.2.2
Index: access_permissions.html
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/lib/UI/pages/admin/access_permissions.html,v
retrieving revision 2.1.2.2
retrieving revision 2.1.2.3
diff -u -r2.1.2.2 -r2.1.2.3
--- access_permissions.html	22 Feb 2002 16:44:07 -0000	2.1.2.2
+++ access_permissions.html	3 Jun 2002 14:02:26 -0000	2.1.2.3
@@ -18,15 +18,13 @@
 
 [set process_perm]
 [flag type=write table="__UI_ACCESS_TABLE__"]
-[tmp ui_owner][db-hash
+[db-hash
 				table="__UI_ACCESS_TABLE__"
 				column="table_control"
-				key="[cgi user_id]"][/tmp]
-[calc] $Scratch->{ui_owner} .= ";" if $Scratch->{ui_owner} =~ /\S/; return; [/calc]
-<!-- [calc]
-	$tc = [scratch ui_owner] '';
-[/calc] -->
+				key="[cgi user_id]"
+				scratch=ui_owner]
 [perl]
+    $tc = $Scratch->{ui_owner};
 	my @filters = grep /^ui_filter:/, keys %$CGI;
 	foreach my $key (@filters) {
 		my $val = delete $CGI->{$key};
@@ -105,6 +103,11 @@
 </tr>
 
 [seti tables][list-databases][/seti]
+[db-hash
+	table="__UI_ACCESS_TABLE__"
+	column="table_control"
+	key="[cgi user_id]"
+	scratch="ui_owner"]
 [perl tables="__UI_META_TABLE__ __UI_ACCESS_TABLE__"]
 
 	my @permissions = (
@@ -295,6 +298,11 @@
 <td bgcolor=__UI_C_INTBLOCK__ valign=top>[L]Export[/L]</td>
 <td bgcolor=__UI_C_INTBLOCK__ valign=top>[L]Owner field[/L]</td>
 </tr>
+[db-hash
+	table="__UI_ACCESS_TABLE__"
+	column="table_control"
+	key="[cgi user_id]"
+	scratch="ui_owner"]
 
 [perl]
 
@@ -348,6 +356,7 @@
 
 	my $perm;
 	my $title;
+	$tc = $Scratch->{ui_owner};
 	while( $perm = shift @permissions) {
 		$title = shift @permissions;
 		my $ref = $permref->{$perm} || {};



No                   revision



No                   revision



2.0.2.1   +9 -0      interchange/dist/lib/UI/usertag/Attic/db_hash.tag


rev 2.0.2.1, prev_rev 2.0
Index: db_hash.tag
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/lib/UI/usertag/Attic/db_hash.tag,v
retrieving revision 2.0
retrieving revision 2.0.2.1
diff -u -r2.0 -r2.0.2.1
--- db_hash.tag	18 Jul 2001 02:22:15 -0000	2.0
+++ db_hash.tag	3 Jun 2002 14:02:26 -0000	2.0.2.1
@@ -21,6 +21,10 @@
 		}
 	}
 	if (! $rest) {
+		if ($opt->{scratch}) {
+			$::Scratch->{$opt->{scratch}} = $ref;
+			return;
+		}
 		return $val unless defined $opt->{value};
 	}
 	my @extra;
@@ -37,6 +41,11 @@
 			return "BAD HASH: $out" if $opt->{show_error};
 			return;
 		}
+	}
+
+	if ($opt->{scratch}) {
+		$::Scratch->{$opt->{scratch}} = $curr->{$final};
+		return;
 	}
 
 	if($opt->{keys}) {