[interchange-cvs] interchange - heins modified 2 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Wed Oct 9 10:24:01 2002
User: heins
Date: 2002-10-09 14:23:32 GMT
Modified: dist/lib/UI/pages/admin flex_select.html
Modified: lib/Vend/Table Editor.pm
Log:
* Allow a table to be configured as meta-specific by default.
Revision Changes Path
2.15 +1 -0 interchange/dist/lib/UI/pages/admin/flex_select.html
rev 2.15, prev_rev 2.14
Index: flex_select.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/flex_select.html,v
retrieving revision 2.14
retrieving revision 2.15
diff -u -r2.14 -r2.15
--- flex_select.html 24 Sep 2002 01:37:29 -0000 2.14
+++ flex_select.html 9 Oct 2002 14:23:32 -0000 2.15
@@ -229,6 +229,7 @@
$Scratch->{keyname} =3D $ref->config('KEY');
=20
$CGI->{ui_show_fields} ||=3D $meta->{ui_show_fields} || $meta->{field};
+ $CGI->{ui_meta_specific} ||=3D $meta->{ui_meta_specific};
$Config->{NoSearch} =3D '';
$ui_text_qualification =3D $CGI->{ui_text_qualification};
if ($ui_text_qualification and $CGI->{ui_text_qualification} =3D~ /[<!=3D=
>\^]/ ) {
1.13 +37 -37 interchange/lib/Vend/Table/Editor.pm
rev 1.13, prev_rev 1.12
Index: Editor.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/lib/Vend/Table/Editor.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Editor.pm 4 Oct 2002 13:40:17 -0000 1.12
+++ Editor.pm 9 Oct 2002 14:23:32 -0000 1.13
@@ -1,6 +1,6 @@
# Vend::Table::Editor - Swiss-army-knife table editor for Interchange
#
-# $Id: Editor.pm,v 1.12 2002/10/04 13:40:17 mheins Exp $
+# $Id: Editor.pm,v 1.13 2002/10/09 14:23:32 mheins Exp $
#
# Copyright (C) 2002 ICDEVGROUP <interchange@icdevgroup.org>
# Copyright (C) 2002 Mike Heins <mike@perusion.net>
@@ -26,7 +26,7 @@
package Vend::Table::Editor;
=20
use vars qw($VERSION);
-$VERSION =3D substr(q$Revision: 1.12 $, 10);
+$VERSION =3D substr(q$Revision: 1.13 $, 10);
=20
use Vend::Util;
use Vend::Interpolate;
@@ -274,8 +274,7 @@
=20
my (@tries) =3D "${table}::$column";
unshift @tries, "${table}::${column}::$key"
- if length($key)
- and $CGI::values{ui_meta_specific} || $opt->{specific};
+ if length($key) and $opt->{specific};
=20
my $sess =3D $Vend::Session->{mv_metadata} || {};
=20
@@ -2759,39 +2758,40 @@
=20
#::logDebug("col=3D$c currval=3D$currval widget=3D$widget->{$c} label=3D$l=
abel->{$c} (type=3D$type)");
my $display =3D display($t, $c, $key, {
- applylocale =3D> 1,
- arbitrary =3D> $opt->{ui_meta_view},
- column =3D> $c,
- default =3D> $currval,
- extra =3D> $extra->{$c},
- fallback =3D> 1,
- field =3D> $field->{$c},
- filter =3D> $filter->{$c},
- height =3D> $height->{$c},
- help =3D> $help->{$c},
- help_url =3D> $help_url->{$c},
- label =3D> $label->{$c},
- key =3D> $key,
- meta =3D> $meta->{$c},
- meta_url =3D> $meta_url,
- meta_url_specific =3D> $meta_url_specific,
- name =3D> $namecol,
- override =3D> $overridden,
- passed =3D> $passed->{$c},
- options =3D> $options->{$c},
- outboard =3D> $outboard->{$c},
- append =3D> $append->{$c},
- prepend =3D> $prepend->{$c},
- lookup =3D> $lookup->{$c},
- lookup_query =3D> $lookup_query->{$c},
- db =3D> $database->{$c},
- pre_filter =3D> $pre_filter->{$c},
- table =3D> $t,
- type =3D> $widget->{$c} || $type,
- width =3D> $width->{$c},
- return_hash =3D> 1,
- ui_no_meta_display =3D> $opt->{ui_no_meta_display},
- });
+ append =3D> $append->{$c},
+ applylocale =3D> 1,
+ arbitrary =3D> $opt->{ui_meta_view},
+ column =3D> $c,
+ db =3D> $database->{$c},
+ default =3D> $currval,
+ extra =3D> $extra->{$c},
+ fallback =3D> 1,
+ field =3D> $field->{$c},
+ filter =3D> $filter->{$c},
+ height =3D> $height->{$c},
+ help =3D> $help->{$c},
+ help_url =3D> $help_url->{$c},
+ key =3D> $key,
+ label =3D> $label->{$c},
+ lookup =3D> $lookup->{$c},
+ lookup_query =3D> $lookup_query->{$c},
+ meta =3D> $meta->{$c},
+ meta_url =3D> $meta_url,
+ meta_url_specific =3D> $meta_url_specific,
+ name =3D> $namecol,
+ options =3D> $options->{$c},
+ outboard =3D> $outboard->{$c},
+ override =3D> $overridden,
+ passed =3D> $passed->{$c},
+ pre_filter =3D> $pre_filter->{$c},
+ prepend =3D> $prepend->{$c},
+ return_hash =3D> 1,
+ specific =3D> $opt->{ui_meta_specific},
+ table =3D> $t,
+ type =3D> $widget->{$c} || $type,
+ ui_no_meta_display =3D> $opt->{ui_no_meta_display},
+ width =3D> $width->{$c},
+ });
#::logDebug("finished display of col=3D$c");
my $update_ctl;
=20