[interchange-cvs] interchange - heins modified 2 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Mon Nov 4 09:49:00 2002
User: heins
Date: 2002-11-04 14:48:27 GMT
Modified: dist/lib/UI/pages/admin order.html order_status.html
Log:
* Fix handling of update in sequence:
-- so that it will not be cycled through more than once
-- so that status messages get displayed on each screen
Revision Changes Path
2.11 +26 -21 interchange/dist/lib/UI/pages/admin/order.html
rev 2.11, prev_rev 2.10
Index: order.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/order.html,v
retrieving revision 2.10
retrieving revision 2.11
diff -u -r2.10 -r2.11
--- order.html 18 Oct 2002 06:00:10 -0000 2.10
+++ order.html 4 Nov 2002 14:48:27 -0000 2.11
@@ -49,25 +49,6 @@
[set ui_class]Orders[/set]
[tmp page_perm]order=l[/tmp]
-@_UI_STD_HEAD_@
-
-[comment]
-<!-- sequence_edit: [cgi ui_sequence_edit] -->
-<!-- item_id_left: [cgi item_id_left] -->
-[/comment]
-
-[value name=mv_data_table set=transactions hide=1]
-[if-mm !tables]
-[set ui_error]
- [L]Not authorized for order administration. Contact administrator?[/L]
-[/set]
-[bounce page="__UI_BASE__/error"]
-[/if-mm]
-
-[tmp can_delete][if-mm advanced order=d]1[/if-mm][/tmp]
-
-[include include/order_delete_archive]
-
[perl tables="[cgi mv_data_table] [scratch extra_tables] __UI_META_TABLE__"]
delete $Scratch->{ui_location};
my $dest = $CGI->{ui_sequence_destination} || '__UI_BASE__/order_status';
@@ -104,6 +85,30 @@
[/perl]
+[if scratch ui_location]
+[comment]Comes from above include[/comment]
+[bounce href="[scratchd ui_location]"]
+[/if]
+
+@_UI_STD_HEAD_@
+
+[comment]
+<!-- sequence_edit: [cgi ui_sequence_edit] -->
+<!-- item_id_left: [cgi item_id_left] -->
+[/comment]
+
+[value name=mv_data_table set=transactions hide=1]
+[if-mm !tables]
+[set ui_error]
+ [L]Not authorized for order administration. Contact administrator?[/L]
+[/set]
+[bounce page="__UI_BASE__/error"]
+[/if-mm]
+
+[tmp can_delete][if-mm advanced order=d]1[/if-mm][/tmp]
+
+[include include/order_delete_archive]
+
[calc]
if ($CGI->{mv_like_spec}) {
my @f = split /\0/, $CGI->{mv_like_field};
@@ -137,7 +142,7 @@
[if scratch ui_location]
[comment]Comes from above include[/comment]
-[bounce href=`delete $Scratch->{ui_location}`]
+[bounce href="[scratchd ui_location]"]
[/if]
[update values]
@@ -493,4 +498,4 @@
@_UI_STD_FOOTER_@
-<!-- page: @@MV_PAGE@@ version: $Id: order.html,v 2.10 2002/10/18 06:00:10 mheins Exp $ -->
+<!-- page: @@MV_PAGE@@ version: $Id: order.html,v 2.11 2002/11/04 14:48:27 mheins Exp $ -->
2.10 +2 -19 interchange/dist/lib/UI/pages/admin/order_status.html
rev 2.10, prev_rev 2.9
Index: order_status.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/order_status.html,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -r2.9 -r2.10
--- order_status.html 4 Nov 2002 14:19:07 -0000 2.9
+++ order_status.html 4 Nov 2002 14:48:27 -0000 2.10
@@ -2,23 +2,6 @@
$Values->{ui_data_fields} = $CGI->{ui_data_fields} = 'status archive delete';
$CGI->{mv_data_table} = 'transactions';
$CGI->{item_id} ||= $CGI->{order};
-
- $Tag->tmp('hidden');
- my $hidden;
- if($CGI->{ui_sequence_edit}) {
- $Scratch->{mv_nextpage} = "__UI_BASE__/order";
- $hidden = {
- item_id_left => $CGI->{item_id_left},
- ui_sequence_edit => $CGI->{ui_sequence_edit},
- }
- }
- else {
- $CGI->{ui_sequence_destination} ||= '__UI_BASE__/order';
- $Scratch->{mv_nextpage} = $CGI->{ui_sequence_destination};
- $hidden = { };
- }
- $hidden->{ui_sequence_destination} = q{@@MV_PAGE@@};
- $Scratch->{hidden} = $hidden;
$CGI->{order} = $CGI->{item_id};
return;
[/calc]
@@ -170,7 +153,7 @@
next-text="Update status only, no ship function"
ok-button-style="font-weight: normal; font-size: smaller"
no-table-meta=1
- mv-nextpage="[scratch mv_nextpage]"
+ mv-nextpage="__UI_BASE__/order"
ui_data_fields="code status tracking_number order_id auth_code archived deleted"
include-form="[scratch form_include]"
include-before="order_id"
@@ -180,7 +163,7 @@
link-before=order_id
link-no-blank=1
link-label="Ordered Items"
- hidden=`$Scratch->{hidden}`
+ hidden.ui_sequence_destination="@@MV_PAGE@@"
/]
<script>
@@ -196,4 +179,4 @@
</script>
@_UI_STD_FOOTER_@
-<!-- page: @@MV_PAGE@@ version: $Id: order_status.html,v 2.9 2002/11/04 14:19:07 mheins Exp $ -->
+<!-- page: @@MV_PAGE@@ version: $Id: order_status.html,v 2.10 2002/11/04 14:48:27 mheins Exp $ -->