From 53a6b83c13bc178a99fa538fbcb515d669e0d5b8 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Sat, 15 Oct 2005 17:29:50 +0000
Subject: [PATCH] fixed [ 1327237 ] 6.7.5 Shortcuts

---
 docs/changelog/6.x.x.txt     |  1 +
 lib/WebGUI/Asset/Shortcut.pm | 36 +++++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 1ffa5ca94..1f4d8cb52 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -34,6 +34,7 @@
    was missing data causing a fatal error.
  - fix [ 1326687 ] Export on windows Apache server doesn't work (with quick
    fix (Thanks to Sven Opitz)
+ - fix [ 1327237 ] 6.7.5 Shortcuts
 
 
 6.7.6
diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index 186ecf1c0..de8710a3c 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -91,10 +91,6 @@ sub getEditForm {
 	my $self = shift;
 	my $tabform = $self->SUPER::getEditForm();
 	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(
 		-value=>$self->getValue("description"),
                 -label=>WebGUI::International::get(85, 'Asset_Shortcut'),
@@ -107,13 +103,25 @@ sub getEditForm {
                 -hoverHelp=>WebGUI::International::get('shortcut template title description', 'Asset_Shortcut'),
 		-namespace=>"Shortcut"
 		);
-	$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")
-		);
+	if ($self->getShortcut->get("templateId")) {
+		$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("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(
 		-name=>"overrideTitle",
 		-value=>$self->getValue("overrideTitle"),
@@ -132,12 +140,6 @@ sub getEditForm {
 		-label=>WebGUI::International::get(9,"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(
 		-label=>WebGUI::International::get(1,"Asset_Shortcut"),
 		-hoverHelp=>WebGUI::International::get('1 description',"Asset_Shortcut"),