Download as
Browse Code »

Commit 3bc1397a910a70a9436f2118f26448f926d6c1fa

Authored by Rodrigo Gonçalves
1 parent f4f161f0
Exists in master

Ajustes para OTRS 4.0.4

Showing 6 changed files with 21 additions and 22 deletions   Show diff stats
Kernel/Config/Files/NewTicketWizard.xml
  Diff comments   View file @3bc1397
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
20 <Loader> 20 <Loader>
21 <JavaScript>NewTicketWizard.js</JavaScript> 21 <JavaScript>NewTicketWizard.js</JavaScript>
22 <JavaScript>thirdparty/alpaca/alpaca-full.min.js</JavaScript> 22 <JavaScript>thirdparty/alpaca/alpaca-full.min.js</JavaScript>
  23 + <JavaScript>thirdparty/jquery-validate-1.13.0/jquery.validate.js</JavaScript>
23 <CSS>alpaca/alpaca-newticketwizard.css</CSS> 24 <CSS>alpaca/alpaca-newticketwizard.css</CSS>
24 <CSS>alpaca/alpaca-jqueryui-newticketwizard.css</CSS> 25 <CSS>alpaca/alpaca-jqueryui-newticketwizard.css</CSS>
25 </Loader> 26 </Loader>
@@ -257,6 +258,7 @@ @@ -257,6 +258,7 @@
257 <Loader> 258 <Loader>
258 <JavaScript>NewTicketWizard.js</JavaScript> 259 <JavaScript>NewTicketWizard.js</JavaScript>
259 <JavaScript>thirdparty/alpaca/alpaca-full.min.js</JavaScript> 260 <JavaScript>thirdparty/alpaca/alpaca-full.min.js</JavaScript>
  261 + <JavaScript>thirdparty/jquery-validate-1.13.0/jquery.validate.js</JavaScript>
260 <CSS>alpaca/alpaca-newticketwizard.css</CSS> 262 <CSS>alpaca/alpaca-newticketwizard.css</CSS>
261 <CSS>alpaca/alpaca-jqueryui-newticketwizard.css</CSS> 263 <CSS>alpaca/alpaca-jqueryui-newticketwizard.css</CSS>
262 </Loader> 264 </Loader>
Kernel/Language/pt_BR_NewTicketWizardPublic.pm
  Diff comments   View file @3bc1397
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 # the enclosed file COPYING for license information (AGPL). If you 9 # the enclosed file COPYING for license information (AGPL). If you
10 # did not receive this file, see http://www.gnu.org/licenses/agpl.txt. 10 # did not receive this file, see http://www.gnu.org/licenses/agpl.txt.
11 # -- 11 # --
12 -package Kernel::Language::pt_BR_NewTicketWizard; 12 +package Kernel::Language::pt_BR_NewTicketWizardPublic;
13 13
14 use strict; 14 use strict;
15 use warnings; 15 use warnings;
Kernel/Language/pt_BR_NewTicketWizardServiceForm.pm
  Diff comments   View file @3bc1397
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 # the enclosed file COPYING for license information (AGPL). If you 8 # the enclosed file COPYING for license information (AGPL). If you
9 # did not receive this file, see http://www.gnu.org/licenses/agpl.txt. 9 # did not receive this file, see http://www.gnu.org/licenses/agpl.txt.
10 # -- 10 # --
11 -package Kernel::Language::pt_BR_NewTicketWizard; 11 +package Kernel::Language::pt_BR_NewTicketWizardServiceForm;
12 12
13 use strict; 13 use strict;
14 use warnings; 14 use warnings;
Kernel/Modules/NewTicketWizard.pm
  Diff comments   View file @3bc1397
@@ -125,7 +125,7 @@ sub Run { @@ -125,7 +125,7 @@ sub Run {
125 } 125 }
126 } 126 }
127 127
128 - if ( $ParamObject->GetParam( Param => "Subaction" ) eq "GetServices" ) { 128 + if ( $ParamObject->GetParam( Param => "Subaction" ) && ($ParamObject->GetParam( Param => "Subaction" ) eq "GetServices") ) {
129 my $content = $Self->BuildServices(); 129 my $content = $Self->BuildServices();
130 130
131 return $LayoutObject->Attachment( 131 return $LayoutObject->Attachment(
@@ -405,14 +405,13 @@ sub CreateTicket { @@ -405,14 +405,13 @@ sub CreateTicket {
405 # Attachments 405 # Attachments
406 my %UploadStuff = $ParamObject->GetUploadAll( Param => "attachment" ); 406 my %UploadStuff = $ParamObject->GetUploadAll( Param => "attachment" );
407 407
408 - # if (%UploadStuff) {  
409 - $TicketObject->ArticleWriteAttachment(  
410 - %UploadStuff,  
411 - ArticleID => $ArticleID,  
412 - UserID => $ConfigObject->Get('CustomerPanelUserID'),  
413 - );  
414 -  
415 - # } 408 + if (keys %UploadStuff) {
  409 + $TicketObject->ArticleWriteAttachment(
  410 + %UploadStuff,
  411 + ArticleID => $ArticleID,
  412 + UserID => $ConfigObject->Get('CustomerPanelUserID'),
  413 + );
  414 + }
416 415
417 $Data{TicketNumber} = $TicketObject->TicketNumberLookup( TicketID => $TicketID ); 416 $Data{TicketNumber} = $TicketObject->TicketNumberLookup( TicketID => $TicketID );
418 417
Kernel/Modules/NewTicketWizardPublic.pm
  Diff comments   View file @3bc1397
@@ -139,7 +139,7 @@ sub Run { @@ -139,7 +139,7 @@ sub Run {
139 my $msgChooseService = $Self->{Config}->{"MessageChooseServicePublic"}; 139 my $msgChooseService = $Self->{Config}->{"MessageChooseServicePublic"};
140 140
141 if ($ParamObject->GetParam( Param => "QueueID" ) ) { 141 if ($ParamObject->GetParam( Param => "QueueID" ) ) {
142 - my %queueData = $Self->{QueueObject}->QueueGet(ID => $ParamObject->GetParam( Param => "QueueID" )); 142 + my %queueData = $QueueObject->QueueGet(ID => $ParamObject->GetParam( Param => "QueueID" ));
143 my $queueName = $queueData{Name}; 143 my $queueName = $queueData{Name};
144 $msgChooseService =~ s/PLACE\_NAME/$queueName/g; 144 $msgChooseService =~ s/PLACE\_NAME/$queueName/g;
145 } 145 }
@@ -429,15 +429,13 @@ sub CreateTicket { @@ -429,15 +429,13 @@ sub CreateTicket {
429 # Attachments 429 # Attachments
430 my %UploadStuff = $ParamObject->GetUploadAll( Param => "attachment" ); 430 my %UploadStuff = $ParamObject->GetUploadAll( Param => "attachment" );
431 431
432 - # if (%UploadStuff) {  
433 - # print STDERR "\nTem anexo!\n";  
434 - $TicketObject->ArticleWriteAttachment(  
435 - %UploadStuff,  
436 - ArticleID => $ArticleID,  
437 - UserID => $Self->{DefaultUserID},  
438 - );  
439 -  
440 - # } 432 + if (keys %UploadStuff) {
  433 + $TicketObject->ArticleWriteAttachment(
  434 + %UploadStuff,
  435 + ArticleID => $ArticleID,
  436 + UserID => $Self->{DefaultUserID},
  437 + );
  438 + }
441 439
442 $Data{TicketNumber} = $TicketObject->TicketNumberLookup( TicketID => $TicketID ); 440 $Data{TicketNumber} = $TicketObject->TicketNumberLookup( TicketID => $TicketID );
443 441
NewTicketWizard.sopm
  Diff comments   View file @3bc1397
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <otrs_package version="1.0"> 2 <otrs_package version="1.0">
3 <Name>NewTicketWizard</Name> 3 <Name>NewTicketWizard</Name>
4 <Version>1.5.0</Version> 4 <Version>1.5.0</Version>
5 - <Framework>4.0.3</Framework> 5 + <Framework>4.0.4</Framework>
6 <Vendor>SeTIC</Vendor> 6 <Vendor>SeTIC</Vendor>
7 <URL>http://www.setic.ufsc.br</URL> 7 <URL>http://www.setic.ufsc.br</URL>
8 <License>GPLv2</License> 8 <License>GPLv2</License>