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

Merge branch 'master' into WebGUI8

Browse source
This commit is contained in:
Graham Knop 2010-04-13 07:50:02 -05:00
commit 2400f19099
797 changed files with 33894 additions and 27196 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -117,7 +117,7 @@ sub _drawQueryBuilder {
"AND" => $i18n->get("AND"),
"OR" => $i18n->get("OR")},
value=>["OR"],
extras=>'class="qbselect"',
extras=>'class="qbselect" '. $self->{_disabled},
}
);
@ -129,6 +129,7 @@ sub _drawQueryBuilder {
# Here starts the field loop
my $i = 1;
my $addLabel = $i18n->get('add', 'Asset_Wobject');
foreach my $field (keys %$fields) {
my $fieldLabel = $fields->{$field}{fieldName};
my $fieldType = $fields->{$field}{fieldType} || "text";
@ -139,7 +140,7 @@ sub _drawQueryBuilder {
name=>$opFieldName,
uiLevel=>5,
options=>$operator{$fieldType},
extras=>'class="qbselect"'
extras=>'class="qbselect" '. $self->{_disabled},
});
# The value select field
my $valFieldName = "val_field".$i;
@ -148,13 +149,14 @@ sub _drawQueryBuilder {
fieldType=>$fieldType,
name=>$valFieldName,
uiLevel=>5,
extras=>qq/title="$fields->{$field}{description}" class="qbselect"/,
extras=>qq/title="$fields->{$field}{description}" class="qbselect" /. $self->{_disabled},
options=>$options,
);
# An empty row
$output .= qq|<tr><td></td><td></td><td></td><td></td><td class="qbtdright"></td></tr>|;
# Table row with field info
my $disabled = $self->{_disabled};
$output .= qq|
<tr>
<td class="qbtdleft"><p class="qbfieldLabel">$fieldLabel</p></td>
@ -166,7 +168,7 @@ sub _drawQueryBuilder {
</td>
<td class="qbtd"></td>
<td class="qbtdright">
<input class="qbButton" type=button value=Add onclick="addCriteria('$fieldLabel', this.form.$opFieldName, this.form.$valFieldName)"></td>
<input class="qbButton" type=button value=$addLabel onclick="addCriteria('$fieldLabel', this.form.$opFieldName, this.form.$valFieldName)" $disabled></td>
</tr>
|;
$i++;
@ -266,8 +268,14 @@ Return the largest of either the asset revision date, or the shortcut revision d
sub getContentLastModified {
my $self = shift;
my $assetRev = $self->get('revisionDate');
my $shortcuttedRev = $self->getShortcut->get('revisionDate');
return $assetRev > $shortcuttedRev ? $assetRev : $shortcuttedRev;
my $shortcut = $self->getShortcut;
my $shortcuttedRev;
if (defined $shortcut) {
$shortcuttedRev = $shortcut->get('revisionDate');
return $assetRev > $shortcuttedRev ? $assetRev : $shortcuttedRev;
} else {
return 0;
}
}
#-------------------------------------------------------------------
@ -303,19 +311,12 @@ override getEditForm => sub {
);
if($self->session->setting->get("metaDataEnabled")) {
$tabform->getTab("properties")->yesNo(
-name=>"shortcutByCriteria",
-value=>$self->getValue("shortcutByCriteria"),
-label=>$i18n->get("Shortcut by alternate criteria"),
-hoverHelp=>$i18n->get("Shortcut by alternate criteria description"),
-extras=>q|onchange="
if (this.form.shortcutByCriteria[0].checked) {
this.form.resolveMultiples.disabled=false;
this.form.shortcutCriteria.disabled=false;
} else {
this.form.resolveMultiples.disabled=true;
this.form.shortcutCriteria.disabled=true;
}"|
);
-name => "shortcutByCriteria",
-value => $self->getValue("shortcutByCriteria"),
-label => $i18n->get("Shortcut by alternate criteria"),
-hoverHelp=> $i18n->get("Shortcut by alternate criteria description"),
-extras => q|onchange="wgCriteriaDisable(this.form, this.form.shortcutByCriteria[0].checked)"|,
);
$tabform->getTab("properties")->yesNo(
-name=>"disableContentLock",
-value=>$self->getValue("disableContentLock"),
@ -1281,6 +1282,8 @@ sub getShortcutsForAssetId {
$properties->{ joinClass } = 'WebGUI::Asset::Shortcut';
$properties->{ whereClause } = 'Shortcut.shortcutToAssetId = ' . $db->quote($assetId);
$properties->{ statesToInclude } = ['published', 'trash', 'clipboard', 'clipboard-limbo', 'trash-limbo'];
$properties->{ statusToInclude } = ['approved', 'pending', 'archived'];
return WebGUI::Asset->getRoot($session)->getLineage(['descendants'], $properties);
}