X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FTicket%2FCreate.html;h=dddafd2e74e39201b8ee5a4c064ab87c34d5372f;hb=de9d037528895f7151a9aead6724ce2df95f9586;hp=697db546b1092b965f8fd5f189c1783264878687;hpb=45d35d5739d05e602bc317739485693e0e9ff0b5;p=freeside.git diff --git a/rt/share/html/Ticket/Create.html b/rt/share/html/Ticket/Create.html index 697db546b..dddafd2e7 100755 --- a/rt/share/html/Ticket/Create.html +++ b/rt/share/html/Ticket/Create.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2017 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -53,12 +53,14 @@ <& /Elements/ListActions, actions => \@results &>
+ + % $m->callback( CallbackName => 'FormStart', QueueObj => $QueueObj, ARGSRef => \%ARGS ); % if ($gnupg_widget) { - <& /Elements/GnuPG/SignEncryptWidget:ShowIssues, self => $gnupg_widget &> + <& /Elements/Crypt/SignEncryptWidget:ShowIssues, self => $gnupg_widget &> % }
@@ -82,12 +84,9 @@ }, }, { name => 'Status', - comp => '/Elements/SelectStatus', + comp => '/Ticket/Elements/SelectStatus', args => { Name => "Status", - Default => $ARGS{Status} || $QueueObj->Lifecycle->DefaultOnCreate, - DefaultValue => 0, - SkipDeleted => 1, QueueObj => $QueueObj, }, }, @@ -105,11 +104,26 @@ % $m->callback( CallbackName => 'AfterOwner', ARGSRef => \%ARGS ); - <& /Ticket/Elements/EditCustomFields, %ARGS, QueueObj => $QueueObj, InTable => 1 &> - <& /Ticket/Elements/EditTransactionCustomFields, %ARGS, QueueObj => $QueueObj, InTable => 1 &> + <& /Elements/EditCustomFields, + %ARGS, + Object => $ticket, + CustomFields => $QueueObj->TicketCustomFields, + Grouping => 'Basics', + InTable => 1, + KeepValue => 1, + &> + <& /Ticket/Elements/EditTransactionCustomFields, %ARGS, QueueObj => $QueueObj, InTable => 1, KeepValue => 1, &> % $m->callback( CallbackName => 'AfterBasics', QueueObj => $QueueObj, ARGSRef => \%ARGS ); + +<& /Elements/EditCustomFieldCustomGroupings, + %ARGS, + Object => $ticket, + CustomFieldGenerator => sub { $QueueObj->TicketCustomFields }, + KeepValue => 1, +&> +
@@ -120,7 +134,7 @@ <&|/l&>Requestors: -<& /Elements/EmailInput, Name => 'Requestors', Size => undef, Default => exists($ARGS{Requestors}) ? $ARGS{Requestors} : $session{CurrentUser}->EmailAddress &> +<& /Elements/EmailInput, Name => 'Requestors', Size => undef, Default => $ARGS{Requestors} // $session{CurrentUser}->EmailAddress, AutocompleteMultiple => 1 &> % $m->callback( CallbackName => 'AfterRequestors', QueueObj => $QueueObj, ARGSRef => \%ARGS ); @@ -128,7 +142,7 @@ <&|/l&>Cc: -<& /Elements/EmailInput, Name => 'Cc', Size => undef, Default => $ARGS{Cc} &> +<& /Elements/EmailInput, Name => 'Cc', Size => undef, Default => $ARGS{Cc}, AutocompleteMultiple => 1 &> @@ -144,7 +158,7 @@ <&|/l&>Admin Cc: -<& /Elements/EmailInput, Name => 'AdminCc', Size => undef, Default => $ARGS{AdminCc} &> +<& /Elements/EmailInput, Name => 'AdminCc', Size => undef, Default => $ARGS{AdminCc}, AutocompleteMultiple => 1 &> @@ -156,6 +170,15 @@ +<& /Elements/EditCustomFields, + %ARGS, + Object => $ticket, + CustomFields => $QueueObj->TicketCustomFields, + Grouping => 'People', + InTable => 1, + KeepValue => 1, +&> + <&|/l&>Subject: @@ -168,7 +191,7 @@ % if ( $gnupg_widget ) {   -<& /Elements/GnuPG/SignEncryptWidget, self => $gnupg_widget, QueueObj => $QueueObj &> +<& /Elements/Crypt/SignEncryptWidget, self => $gnupg_widget, QueueObj => $QueueObj &> % } @@ -203,9 +226,9 @@
- <&| /Widgets/TitleBox, title => loc('The Basics'), - title_class=> 'inverse', - color => "#993333" &> + <&| /Widgets/TitleBox, title => loc('The Basics'), + title_class=> 'inverse', + color => "#993333" &>
<&|/l&>Priority: <& /Elements/SelectPriority, @@ -219,29 +242,37 @@ &>
<&|/l&>Time Estimated: -<& /Elements/EditTimeValue, Name => 'TimeEstimated', Default => $ARGS{TimeEstimated} || '', InUnits => $ARGS{'TimeEstimated-TimeUnits'} &> +<& /Elements/EditTimeValue, Name => 'TimeEstimated', Default => $ARGS{TimeEstimated} || '' &>
<&|/l&>Time Worked: -<& /Elements/EditTimeValue, Name => 'TimeWorked', Default => $ARGS{TimeWorked} || '', InUnits => $ARGS{'TimeWorked-TimeUnits'} &> +<& /Elements/EditTimeValue, Name => 'TimeWorked', Default => $ARGS{TimeWorked} || '' &>
<&|/l&>Time Left: -<& /Elements/EditTimeValue, Name => 'TimeLeft', Default => $ARGS{TimeLeft} || '', InUnits => $ARGS{'TimeLeft-TimeUnits'} &> +<& /Elements/EditTimeValue, Name => 'TimeLeft', Default => $ARGS{TimeLeft} || '' &>

<&|/Widgets/TitleBox, title => loc("Dates"), - title_class=> 'inverse', - color => "#663366" &> + title_class=> 'inverse', + color => "#663366" &> +<& /Elements/EditCustomFields, + %ARGS, + Object => $ticket, + CustomFields => $QueueObj->TicketCustomFields, + Grouping => 'Dates', + InTable => 1, + KeepValue => 1, +&>
<&|/l&>Starts:<& /Elements/SelectDate, Name => "Starts", Default => $ARGS{Starts} || '' &>
<&|/l&>Due:<& /Elements/SelectDate, Name => "Due", Default => $ARGS{Due} || '' &>
@@ -253,17 +284,11 @@
<&| /Widgets/TitleBox, title => loc('Links'), title_class=> 'inverse' &> -<&|/l&>(Enter ticket ids or URLs, separated with spaces) - - - - - - - - - -
<&|/l&>Depends on
<&|/l&>Depended on by
<&|/l&>Parents
<&|/l&>Children
<&|/l&>Refers to
<&|/l&>Referred to by
Customer ID
+<& /Elements/AddLinks, + Object => $ticket, + CustomFields => $QueueObj->TicketCustomFields, + ARGSRef => \%ARGS, + &>

@@ -280,6 +305,8 @@ $m->callback( CallbackName => "Init", ARGSRef => \%ARGS ); my $Queue = $ARGS{Queue}; $session{DefaultQueue} = $Queue; +my $current_user = $session{'CurrentUser'}; + if ($CloneTicket) { my $CloneTicketObj = RT::Ticket->new( $session{CurrentUser} ); $CloneTicketObj->Load($CloneTicket) @@ -297,12 +324,9 @@ if ($CloneTicket) { # not TimeWorked, TimeEstimated, or TimeLeft $clone->{$_} = $CloneTicketObj->$_->AsString - for grep { $CloneTicketObj->$_->Unix } + for grep { $CloneTicketObj->$_->IsSet } map { $_ . "Obj" } qw/Starts Started Due Resolved/; - my $members = $CloneTicketObj->Members; - my ( @members, @members_of, @refers, @refers_by, @depends, @depends_by ); - my $refers = $CloneTicketObj->RefersTo; my $get_link_value = sub { my ($link, $type) = @_; my $uri_method = $type . 'URI'; @@ -311,10 +335,12 @@ if ($CloneTicket) { return if $uri->IsLocal and $uri->Object and $uri->Object->isa('RT::Ticket') and - $uri->Object->Type eq 'reminder'; + $uri->Object->__Value('Type') eq 'reminder'; return $link->$local_method || $uri->URI; }; + my (@refers, @refers_by); + my $refers = $CloneTicketObj->RefersTo; while ( my $refer = $refers->Next ) { my $refer_value = $get_link_value->($refer, 'Target'); push @refers, $refer_value if defined $refer_value; @@ -339,10 +365,10 @@ if ($CloneTicket) { } if ( @cf_values > 1 && $cf->Type eq 'Select' ) { - $clone->{"Object-RT::Ticket--CustomField-$cf_id-Value"} = \@cf_values; + $clone->{GetCustomFieldInputName( CustomField => $cf )} = \@cf_values; } else { - $clone->{"Object-RT::Ticket--CustomField-$cf_id-Value"} = join "\n", + $clone->{GetCustomFieldInputName( CustomField => $cf )} = join "\n", @cf_values; } } @@ -357,6 +383,8 @@ if ($CloneTicket) { } $clone->{'new-Customer'} = join(' ', @customers); + $m->callback( CallbackName => 'MassageCloneArgs', ARGSRef => $clone, Queue => $Queue ); + for ( keys %$clone ) { $ARGS{$_} = $clone->{$_} if not defined $ARGS{$_}; } @@ -367,34 +395,42 @@ my @results; my $title = loc("Create a new ticket"); -my $QueueObj = RT::Queue->new($session{'CurrentUser'}); -$QueueObj->Load($Queue) || Abort(loc("Queue could not be loaded.")); +my $QueueObj = RT::Queue->new($current_user); +$QueueObj->Load($Queue) || Abort(loc("Queue [_1] could not be loaded.", $Queue||'')); $m->callback( QueueObj => $QueueObj, title => \$title, results => \@results, ARGSRef => \%ARGS ); -$QueueObj->Disabled && Abort(loc("Cannot create tickets in a disabled queue.")); +$m->scomp( '/Articles/Elements/SubjectOverride', ARGSRef => \%ARGS, QueueObj => $QueueObj, results => \@results ); -my $CFs = $QueueObj->TicketCustomFields(); +$QueueObj->Disabled && Abort(loc("Cannot create tickets in a disabled queue.")); -my $ValidCFs = $m->comp( - '/Elements/ValidateCustomFields', - CustomFields => $CFs, - ARGSRef => \%ARGS -); +my $ticket = RT::Ticket->new($current_user); # empty ticket object ProcessAttachments(ARGSRef => \%ARGS); my $checks_failure = 0; -my $gnupg_widget = $m->comp('/Elements/GnuPG/SignEncryptWidget:new', Arguments => \%ARGS ); -$m->comp( '/Elements/GnuPG/SignEncryptWidget:Process', +{ + my ($status, @msg) = $m->comp( + '/Elements/ValidateCustomFields', + CustomFields => $QueueObj->TicketCustomFields, + ARGSRef => \%ARGS + ); + unless ($status) { + $checks_failure = 1; + push @results, @msg; + } +} + +my $gnupg_widget = $m->comp('/Elements/Crypt/SignEncryptWidget:new', Arguments => \%ARGS ); +$m->comp( '/Elements/Crypt/SignEncryptWidget:Process', self => $gnupg_widget, QueueObj => $QueueObj, ); if ( !exists $ARGS{'AddMoreAttach'} && ($ARGS{'id'}||'') eq 'new' ) { - my $status = $m->comp('/Elements/GnuPG/SignEncryptWidget:Check', + my $status = $m->comp('/Elements/Crypt/SignEncryptWidget:Check', self => $gnupg_widget, Operation => 'Create', QueueObj => $QueueObj, @@ -426,7 +462,7 @@ $m->comp( '/Articles/Elements/CheckSkipCreate', ARGSRef => \%ARGS, skip_create = checks_failure => $checks_failure, results => \@results ); if ((!exists $ARGS{'AddMoreAttach'}) and (defined($ARGS{'id'}) and $ARGS{'id'} eq 'new')) { # new ticket? - if ( $ValidCFs && !$checks_failure && !$skip_create ) { + if ( !$checks_failure && !$skip_create ) { # CREATE THE TICKET. # For some reason it's done by a Mason component named "Display.html" # and the call is buried in obscure error-handling stuff. @@ -442,13 +478,6 @@ if ((!exists $ARGS{'AddMoreAttach'}) and (defined($ARGS{'id'}) and $ARGS{'id'} e $RT::Logger->crit("After display call; error is $@"); $m->abort(); } - elsif ( !$ValidCFs ) { - # Invalid CFs - while (my $CF = $CFs->Next) { - my $msg = $m->notes('InvalidField-' . $CF->Id) or next; - push @results, $CF->Name . ': ' . $msg; - } - } } PageMenu->child( basics => raw_html => q[] . loc('Basics') . q[]); PageMenu->child( details => raw_html => q[] . loc('Details') . q[]);