[Rt-commit] rt branch, 4.4/include-article-queue, repushed
Craig Kaiser
craig at bestpractical.com
Thu Feb 22 09:10:20 EST 2018
The branch 4.4/include-article-queue was deleted and repushed:
was b0b87cccbd3fef1f90f96f01b8dc5060a90ba80e
now 1dedf31437b5ec3b7660730405af2c3c8cf7025e
1: 57ba572b7 ! 1: cc9e85ec7 Add default value for Articles in Queues
@@ -78,7 +78,7 @@
&& grep rindex($_, "$ARGS{'Name'}-Articles-", 0) == 0,
keys %$parent_args;
-+ my $Ticket = $ARGS{Ticket};
++my $Ticket = $ARGS{Ticket};
+if ( !$Ticket and $parent_args->{id} and $parent_args->{id} ne 'new' ) {
+ $Ticket = RT::Ticket->new($session{'CurrentUser'});
+ $Ticket->Load($parent_args->{id});
@@ -115,11 +115,13 @@
+ my ($ret, $msg) = $QueueObj->Load( $queue_id );
+ $RT::Logger->error($msg) unless ($ret);
+
-+ if ($QueueObj->DefaultValue('Article') ){
++if ( $QueueObj->id && $QueueObj->DefaultValue('Article') ) {
+ my $article = RT::Article->new($session{'CurrentUser'});
+ my ($ret, $msg) = $article->Load( $QueueObj->DefaultValue('Article') );
-+ return ($ret, $msg) unless $ret;
-+ push (@articles, $article);
++ $RT::Logger->error($msg) unless ($ret);
++ if ($ret) {
++ push (@articles, $article);
++ }
+ }
+}
2: 67d79fbf5 ! 2: ee67f9cf8 Add Autocomplete for Articles
@@ -89,10 +89,10 @@
+%# those contributions and any derivatives thereof.
+%#
+%# END BPS TAGGED BLOCK }}}
-+<input data-autocomplete="Articles" data-autocomplete-queue="<% $QueueObj->Id %>" data-autocomplete-return="Name" name="<% $Name %>" value="<% $Default %>">
++<input data-autocomplete="Articles" <% $QueueObj && $QueueObj->id ? q{data-autocomplete-queue="} . $QueueObj->id . q{"} : '' |n %> data-autocomplete-return="Name" name="<% $Name %>" value="<% $Default %>">
+
+<%ARGS>
-+$QueueObj => ""
++$QueueObj => undef
+$Default => undef
+$Name => 'Article'
+</%ARGS>
3: b0b87cccb = 3: 1dedf3143 Test Default Article content on Ticket create
More information about the rt-commit
mailing list