oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed: shortcut overrides new value column doesn't show macros as unparsed

Browse source 
fixed: shortcut select by alternate criteria wizard doesn't show lists properly
This commit is contained in:
Graham Knop 2008-08-13 20:34:18 +00:00
parent 75cf3923ad
commit ffb8408b83
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/changelog/7.x.x.txt
View file

@ -1,4 +1,6 @@
7.5.20 7.5.20
- fixed: shortcut overrides new value column doesn't show macros as unparsed
- fixed: shortcut select by alternate criteria wizard doesn't show lists properly
- fixed: The indent loop of the Navigation wobject has an incorrect number of - fixed: The indent loop of the Navigation wobject has an incorrect number of
iterations in some cases. (Martin Kamerbeek / Oqapi) iterations in some cases. (Martin Kamerbeek / Oqapi)
- fixed: Thingy: Setting the size of a field has no effect - fixed: Thingy: Setting the size of a field has no effect

7
lib/WebGUI/Asset/Shortcut.pm
View file

@ -19,6 +19,7 @@ use WebGUI::Operation::Profile;
use WebGUI::ProfileField; use WebGUI::ProfileField;
use WebGUI::ProfileCategory; use WebGUI::ProfileCategory;
use WebGUI::Macro; use WebGUI::Macro;
use HTML::Entities qw(encode_entities);
our @ISA = qw(WebGUI::Asset); our @ISA = qw(WebGUI::Asset);
@ -26,7 +27,7 @@ our @ISA = qw(WebGUI::Asset);
sub _drawQueryBuilder { sub _drawQueryBuilder {
my $self = shift; my $self = shift;
# Initialize operators # Initialize operators
my @textFields = qw|text yesNo selectList radioList|; my @textFields = qw|text yesNo selectBox radioList|;
my $i18n = WebGUI::International->new($self->session,"Asset_Shortcut"); my $i18n = WebGUI::International->new($self->session,"Asset_Shortcut");
my %operator; my %operator;
foreach (@textFields) { foreach (@textFields) {
@ -93,7 +94,7 @@ sub _drawQueryBuilder {
name=>$valFieldName, name=>$valFieldName,
uiLevel=>5, uiLevel=>5,
extras=>qq/title="$fields->{$field}{description}" class="qbselect"/, extras=>qq/title="$fields->{$field}{description}" class="qbselect"/,
possibleValues=>$fields->{$field}{possibleValues}, options=>$fields->{$field}{possibleValues},
); );
# An empty row # An empty row
$output .= qq|<tr><td></td><td></td><td></td><td></td><td class="qbtdright"></td></tr>|; $output .= qq|<tr><td></td><td></td><td></td><td></td><td class="qbtdright"></td></tr>|;
@ -378,7 +379,7 @@ sub getOverridesList {
$output .= '</td><td>'; $output .= '</td><td>';
$output .= $overrides{overrides}{$prop}{origValue}; $output .= $overrides{overrides}{$prop}{origValue};
$output .= '</td><td>'; $output .= '</td><td>';
$output .= $overrides{overrides}{$prop}{newValue}; $output .= encode_entities($overrides{overrides}{$prop}{newValue}, '<>&"^');
$output .= '</td><td>'; $output .= '</td><td>';
$output .= $overrides{overrides}{$prop}{parsedValue}; $output .= $overrides{overrides}{$prop}{parsedValue};
$output .= '</td></tr>'; $output .= '</td></tr>';