From 3bc1397a910a70a9436f2118f26448f926d6c1fa Mon Sep 17 00:00:00 2001
From: Rodrigo Goncalves <rodrigo.g@ufsc.br>
Date: Wed, 14 Jan 2015 17:56:30 -0200
Subject: [PATCH] Ajustes para OTRS 4.0.4

---
 Kernel/Config/Files/NewTicketWizard.xml             |  2 ++
 Kernel/Language/pt_BR_NewTicketWizardPublic.pm      |  2 +-
 Kernel/Language/pt_BR_NewTicketWizardServiceForm.pm |  2 +-
 Kernel/Modules/NewTicketWizard.pm                   | 17 ++++++++---------
 Kernel/Modules/NewTicketWizardPublic.pm             | 18 ++++++++----------
 NewTicketWizard.sopm                                |  2 +-
 6 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/Kernel/Config/Files/NewTicketWizard.xml b/Kernel/Config/Files/NewTicketWizard.xml
index 1d01dc1..aa2b079 100644
--- a/Kernel/Config/Files/NewTicketWizard.xml
+++ b/Kernel/Config/Files/NewTicketWizard.xml
@@ -20,6 +20,7 @@
 				<Loader>
 					<JavaScript>NewTicketWizard.js</JavaScript>
 					<JavaScript>thirdparty/alpaca/alpaca-full.min.js</JavaScript>
+					<JavaScript>thirdparty/jquery-validate-1.13.0/jquery.validate.js</JavaScript>
 					<CSS>alpaca/alpaca-newticketwizard.css</CSS>
 					<CSS>alpaca/alpaca-jqueryui-newticketwizard.css</CSS>
 				</Loader>
@@ -257,6 +258,7 @@
 				<Loader>
 					<JavaScript>NewTicketWizard.js</JavaScript>
 					<JavaScript>thirdparty/alpaca/alpaca-full.min.js</JavaScript>
+					<JavaScript>thirdparty/jquery-validate-1.13.0/jquery.validate.js</JavaScript>
 					<CSS>alpaca/alpaca-newticketwizard.css</CSS>
 					<CSS>alpaca/alpaca-jqueryui-newticketwizard.css</CSS>
 				</Loader>
diff --git a/Kernel/Language/pt_BR_NewTicketWizardPublic.pm b/Kernel/Language/pt_BR_NewTicketWizardPublic.pm
index dda7adc..b490a7f 100644
--- a/Kernel/Language/pt_BR_NewTicketWizardPublic.pm
+++ b/Kernel/Language/pt_BR_NewTicketWizardPublic.pm
@@ -9,7 +9,7 @@
 # the enclosed file COPYING for license information (AGPL). If you
 # did not receive this file, see http://www.gnu.org/licenses/agpl.txt.
 # --
-package Kernel::Language::pt_BR_NewTicketWizard;
+package Kernel::Language::pt_BR_NewTicketWizardPublic;
 
 use strict;
 use warnings;
diff --git a/Kernel/Language/pt_BR_NewTicketWizardServiceForm.pm b/Kernel/Language/pt_BR_NewTicketWizardServiceForm.pm
index 6dde17a..e0aef49 100644
--- a/Kernel/Language/pt_BR_NewTicketWizardServiceForm.pm
+++ b/Kernel/Language/pt_BR_NewTicketWizardServiceForm.pm
@@ -8,7 +8,7 @@
 # the enclosed file COPYING for license information (AGPL). If you
 # did not receive this file, see http://www.gnu.org/licenses/agpl.txt.
 # --
-package Kernel::Language::pt_BR_NewTicketWizard;
+package Kernel::Language::pt_BR_NewTicketWizardServiceForm;
 
 use strict;
 use warnings;
diff --git a/Kernel/Modules/NewTicketWizard.pm b/Kernel/Modules/NewTicketWizard.pm
index 817eed8..dfa5823 100644
--- a/Kernel/Modules/NewTicketWizard.pm
+++ b/Kernel/Modules/NewTicketWizard.pm
@@ -125,7 +125,7 @@ sub Run {
 		}
 	}
 
-	if ( $ParamObject->GetParam( Param => "Subaction" ) eq "GetServices" ) {
+	if ( $ParamObject->GetParam( Param => "Subaction" ) && ($ParamObject->GetParam( Param => "Subaction" ) eq "GetServices") ) {
 		my $content = $Self->BuildServices();
 
 		return $LayoutObject->Attachment(
@@ -405,14 +405,13 @@ sub CreateTicket {
 	# Attachments
 	my %UploadStuff = $ParamObject->GetUploadAll( Param => "attachment" );
 
-	#	if (%UploadStuff) {
-	$TicketObject->ArticleWriteAttachment(
-		%UploadStuff,
-		ArticleID => $ArticleID,
-		UserID    => $ConfigObject->Get('CustomerPanelUserID'),
-	);
-
-	#	}
+	if (keys %UploadStuff) {
+		$TicketObject->ArticleWriteAttachment(
+			%UploadStuff,
+			ArticleID => $ArticleID,
+			UserID    => $ConfigObject->Get('CustomerPanelUserID'),
+		);
+	}
 
 	$Data{TicketNumber} = $TicketObject->TicketNumberLookup( TicketID => $TicketID );
 
diff --git a/Kernel/Modules/NewTicketWizardPublic.pm b/Kernel/Modules/NewTicketWizardPublic.pm
index c152938..1416ea6 100644
--- a/Kernel/Modules/NewTicketWizardPublic.pm
+++ b/Kernel/Modules/NewTicketWizardPublic.pm
@@ -139,7 +139,7 @@ sub Run {
 	my $msgChooseService = $Self->{Config}->{"MessageChooseServicePublic"};
 	
 	if ($ParamObject->GetParam( Param => "QueueID" ) ) {
-		my %queueData = $Self->{QueueObject}->QueueGet(ID => $ParamObject->GetParam( Param => "QueueID" ));
+		my %queueData = $QueueObject->QueueGet(ID => $ParamObject->GetParam( Param => "QueueID" ));
 		my $queueName = $queueData{Name};		
 		$msgChooseService =~ s/PLACE\_NAME/$queueName/g;
 	}
@@ -429,15 +429,13 @@ sub CreateTicket {
 	# Attachments
 	my %UploadStuff = $ParamObject->GetUploadAll( Param => "attachment" );
 
-	#	if (%UploadStuff) {
-	#		print STDERR "\nTem anexo!\n";
-	$TicketObject->ArticleWriteAttachment(
-		%UploadStuff,
-		ArticleID => $ArticleID,
-		UserID    => $Self->{DefaultUserID},
-	);
-
-	#	}
+	if (keys %UploadStuff) {
+		$TicketObject->ArticleWriteAttachment(
+			%UploadStuff,
+			ArticleID => $ArticleID,
+			UserID    => $Self->{DefaultUserID},
+		);
+	}
 
 	$Data{TicketNumber} = $TicketObject->TicketNumberLookup( TicketID => $TicketID );
 
diff --git a/NewTicketWizard.sopm b/NewTicketWizard.sopm
index 78b29f9..6e9b851 100755
--- a/NewTicketWizard.sopm
+++ b/NewTicketWizard.sopm
@@ -2,7 +2,7 @@
 <otrs_package version="1.0">
     <Name>NewTicketWizard</Name>
     <Version>1.5.0</Version>
-    <Framework>4.0.3</Framework>
+    <Framework>4.0.4</Framework>
     <Vendor>SeTIC</Vendor>
     <URL>http://www.setic.ufsc.br</URL>
     <License>GPLv2</License>
--
libgit2 0.21.2