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

fixed [ 1327237 ] 6.7.5 Shortcuts

Browse source
This commit is contained in:
JT Smith 2005-10-15 17:29:50 +00:00
parent db63b9a6ab
commit 53a6b83c13
2 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/6.x.x.txt
View file

@ -34,6 +34,7 @@
was missing data causing a fatal error. was missing data causing a fatal error.
- fix [ 1326687 ] Export on windows Apache server doesn't work (with quick - fix [ 1326687 ] Export on windows Apache server doesn't work (with quick
fix (Thanks to Sven Opitz) fix (Thanks to Sven Opitz)
- fix [ 1327237 ] 6.7.5 Shortcuts
6.7.6 6.7.6

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

@ -91,10 +91,6 @@ sub getEditForm {
my $self = shift; my $self = shift;
my $tabform = $self->SUPER::getEditForm(); my $tabform = $self->SUPER::getEditForm();
my $originalTemplate; my $originalTemplate;
$originalTemplate = WebGUI::Asset::Template->new($self->getShortcut->get("templateId"));
$originalTemplate = WebGUI::Asset::Template->new($self->getShortcut->get("collaborationTemplateId")) if (ref $self->getShortcut eq "WebGUI::Asset::Wobject::Collaboration");
#Shortcuts of Posts and Threads and other assets without a "templateId"
# are going to be ->view'ed by their original parent's settings anyway.
$tabform->getTab("properties")->HTMLArea( $tabform->getTab("properties")->HTMLArea(
-value=>$self->getValue("description"), -value=>$self->getValue("description"),
-label=>WebGUI::International::get(85, 'Asset_Shortcut'), -label=>WebGUI::International::get(85, 'Asset_Shortcut'),
@ -107,13 +103,25 @@ sub getEditForm {
-hoverHelp=>WebGUI::International::get('shortcut template title description', 'Asset_Shortcut'), -hoverHelp=>WebGUI::International::get('shortcut template title description', 'Asset_Shortcut'),
-namespace=>"Shortcut" -namespace=>"Shortcut"
); );
$tabform->getTab("display")->template( if ($self->getShortcut->get("templateId")) {
-name=>"overrideTemplateId", $originalTemplate = WebGUI::Asset::Template->new($self->getShortcut->get("templateId"));
-value=>$self->getValue("overrideTemplateId") || $originalTemplate->getId, $originalTemplate = WebGUI::Asset::Template->new($self->getShortcut->get("collaborationTemplateId")) if (ref $self->getShortcut eq "WebGUI::Asset::Wobject::Collaboration");
-label=>WebGUI::International::get('override asset template', 'Asset_Shortcut'), #Shortcuts of Posts and Threads and other assets without a "templateId"
-hoverHelp=>WebGUI::International::get('override asset template description', 'Asset_Shortcut'), # are going to be ->view'ed by their original parent's settings anyway.
-namespace=>$originalTemplate->get("namespace") $tabform->getTab("display")->template(
); -name=>"overrideTemplateId",
-value=>$self->getValue("overrideTemplateId") || $originalTemplate->getId,
-label=>WebGUI::International::get('override asset template', 'Asset_Shortcut'),
-hoverHelp=>WebGUI::International::get('override asset template description', 'Asset_Shortcut'),
-namespace=>$originalTemplate->get("namespace")
);
$tabform->getTab("display")->yesNo(
-name=>"overrideTemplate",
-value=>$self->getValue("overrideTemplate"),
-label=>WebGUI::International::get(10,"Asset_Shortcut"),
-hoverHelp=>WebGUI::International::get('10 description',"Asset_Shortcut")
);
}
$tabform->getTab("properties")->yesNo( $tabform->getTab("properties")->yesNo(
-name=>"overrideTitle", -name=>"overrideTitle",
-value=>$self->getValue("overrideTitle"), -value=>$self->getValue("overrideTitle"),
@ -132,12 +140,6 @@ sub getEditForm {
-label=>WebGUI::International::get(9,"Asset_Shortcut"), -label=>WebGUI::International::get(9,"Asset_Shortcut"),
-hoverHelp=>WebGUI::International::get('9 description',"Asset_Shortcut") -hoverHelp=>WebGUI::International::get('9 description',"Asset_Shortcut")
); );
$tabform->getTab("display")->yesNo(
-name=>"overrideTemplate",
-value=>$self->getValue("overrideTemplate"),
-label=>WebGUI::International::get(10,"Asset_Shortcut"),
-hoverHelp=>WebGUI::International::get('10 description',"Asset_Shortcut")
);
$tabform->getTab("properties")->readOnly( $tabform->getTab("properties")->readOnly(
-label=>WebGUI::International::get(1,"Asset_Shortcut"), -label=>WebGUI::International::get(1,"Asset_Shortcut"),
-hoverHelp=>WebGUI::International::get('1 description',"Asset_Shortcut"), -hoverHelp=>WebGUI::International::get('1 description',"Asset_Shortcut"),