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

Use the new getProperties() API rather than the definition datastructure.

Browse source
This commit is contained in:
Scott Walters 2010-08-11 15:09:52 -04:00
parent 48f239a178
commit c65eb74197
1 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@ define tableName => 'Shortcut';
property shortcutToAssetId => ( property shortcutToAssetId => (
noFormPost => 1, noFormPost => 1,
fieldType => "hidden", fieldType => "hidden",
default => undef, required => 1, # default => undef, # XXX
noFormPost => 1, noFormPost => 1,
); );
property shortcutByCriteria => ( property shortcutByCriteria => (
@ -268,7 +268,7 @@ Return the largest of either the asset revision date, or the shortcut revision d
sub getContentLastModified { sub getContentLastModified {
my $self = shift; my $self = shift;
my $assetRev = $self->get('revisionDate'); my $assetRev = $self->get('revisionDate');
my $shortcut = $self->getShortcut; my $shortcut = $self->getShortcut; # XXX "newById must get an assetId"
my $shortcuttedRev; my $shortcuttedRev;
if (defined $shortcut) { if (defined $shortcut) {
$shortcuttedRev = $shortcut->get('revisionDate'); $shortcuttedRev = $shortcut->get('revisionDate');
@ -424,24 +424,27 @@ sub getOverridesList {
$output .= '<tr class="tableHeader"><td>'.$i18n->get('fieldName').'</td><td>'.$i18n->get('edit delete fieldname').'</td><td>'.$i18n->get('Original Value').'</td><td>'.$i18n->get('New value').'</td><td>'.$i18n->get('Replacement value').'</td></tr>'; $output .= '<tr class="tableHeader"><td>'.$i18n->get('fieldName').'</td><td>'.$i18n->get('edit delete fieldname').'</td><td>'.$i18n->get('Original Value').'</td><td>'.$i18n->get('New value').'</td><td>'.$i18n->get('Replacement value').'</td></tr>';
my $shortcut = $self->getShortcutOriginal; my $shortcut = $self->getShortcutOriginal;
return undef unless defined $shortcut; return undef unless defined $shortcut;
foreach my $definition (@{$shortcut->definition($self->session)}) {
foreach my $prop (keys %{$definition->{properties}}) { for my $property_name ( $shortcut->getProperties ) {
next if $definition->{properties}{$prop}{fieldType} eq 'hidden'; my $property = $shortcut->meta->find_attribute_by_name( $property_name );
next if $definition->{properties}{$prop}{label} eq ''; next if $property->noFormPost;
$output .= '<tr>'; next if $property->fieldType eq 'hidden';
$output .= '<td class="tableData">'.$definition->{properties}{$prop}{label}.'</td>'; next unless $property->can('label');
$output .= '<td class="tableData">'; next if $property->label eq '';
$output .= $self->session->icon->edit('func=editOverride;fieldName='.$prop,$self->get("url")); $output .= '<tr>';
$output .= $self->session->icon->delete('func=deleteOverride;fieldName='.$prop,$self->get("url")) if exists $overrides{overrides}{$prop}; $output .= '<td class="tableData">'.$property->label.'</td>';
$output .= '</td><td>'; $output .= '<td class="tableData">';
$output .= $overrides{overrides}{$prop}{origValue}; $output .= $self->session->icon->edit('func=editOverride;fieldName='.$property_name,$self->get("url"));
$output .= '</td><td>'; $output .= $self->session->icon->delete('func=deleteOverride;fieldName='.$property_name,$self->get("url")) if exists $overrides{overrides}{$property_name};
$output .= encode_entities($overrides{overrides}{$prop}{newValue}, '<>&"^'); $output .= '</td><td>';
$output .= '</td><td>'; $output .= $overrides{overrides}{$property_name}{origValue};
$output .= $overrides{overrides}{$prop}{parsedValue}; $output .= '</td><td>';
$output .= "</td></tr>\n"; $output .= encode_entities($overrides{overrides}{$property_name}{newValue}, '<>&"^');
} $output .= '</td><td>';
$output .= $overrides{overrides}{$property_name}{parsedValue};
$output .= "</td></tr>\n";
} }
$output .= '</table>'; $output .= '</table>';
return $output; return $output;
} }
@ -544,7 +547,7 @@ processed if set.
sub getShortcut { sub getShortcut {
my $self = shift; my $self = shift;
unless ($self->{_shortcut}) { unless ($self->{_shortcut}) {
$self->{_shortcut} = $self->getShortcutOriginal; $self->{_shortcut} = $self->getShortcutOriginal; # XXX "newById must get an assetId"
} }
$self->{_shortcut}{_properties}{displayTitle} = undef if ($self->isDashlet); $self->{_shortcut}{_properties}{displayTitle} = undef if ($self->isDashlet);
# Hide title by default. If you want, you can create an override # Hide title by default. If you want, you can create an override
@ -683,7 +686,9 @@ Return the asset that this Shortcut points to.
sub getShortcutDefault { sub getShortcutDefault {
my $self = shift; my $self = shift;
return WebGUI::Asset->newById($self->session, $self->get("shortcutToAssetId")); use Carp; $self->get('shortcutToAssetId') or Carp::confess('no ShortcutToAssetId; our getId says: ' . $self->getId);
warn "getShortcutDefault has a shortcutToAssetId of: " . $self->get('shortcutToAssetId');
return WebGUI::Asset->newById($self->session, $self->get("shortcutToAssetId")); # XXX "newById must get an assetId"
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -700,7 +705,7 @@ sub getShortcutOriginal {
if ($self->get("shortcutByCriteria")) { if ($self->get("shortcutByCriteria")) {
return $self->getShortcutByCriteria; return $self->getShortcutByCriteria;
} else { } else {
return $self->getShortcutDefault; return $self->getShortcutDefault; # XXX "newById must get an assetId"
} }
} }