Jira: Switching to info template! No HTML needed yey!

master
Rob 2016-05-24 20:40:41 +01:00
parent 0d73da25b2
commit 9709d66f62
3 changed files with 21 additions and 55 deletions

View File

@ -29,34 +29,27 @@ handle query => sub {
my $ticket_number = $+{ticket_number};
my $ticket_id = $ticket_key . '-' . $ticket_number;
my $html_return = '';
my $return_value = {};
foreach my $project_key (@all_project_keys) {
my $this_project = $projects->{$project_key};
if (my $ticket_project = $this_project->{ticket_keys}{$ticket_key}) {
$html_return .= '<br>' if ($html_return); # We're not first, add a line.
$html_return .=
$ticket_project . ' ('
. $this_project->{description}
. '): see ticket <a href="'
. $this_project->{browse_url}
. $ticket_id . '">'
. $ticket_id . '</a>.';
$return_value->{description} = $this_project->{description};
$return_value->{url} = $this_project->{browse_url};
$return_value->{id} = $ticket_id;
$return_value->{project} = $ticket_project;
}
}
return unless $html_return;
return unless $return_value;
return undef, structured_answer => {
data => {
link => $html_return,
input => $ticket_id
title => "$return_value->{project} ($return_value->{description})",
subtitle => "JIRA Ticket Lookup: $return_value->{id}",
url => "$return_value->{url}$return_value->{id}",
},
templates => {
group => 'text',
options => {
content => 'DDH.jira.content'
}
group => 'info'
}
};
};

View File

@ -1,6 +0,0 @@
<div class='zci__jira'>
<h3 class='zci__caption zci__result'>{{{link}}}</h3>
<h4 class='zci__subheader'>
JIRA ticket lookup: {{input}}
</h4>
</div>

View File

@ -10,48 +10,27 @@ zci is_cached => 1;
sub build_test
{
my ($html, $ticket_id) = @_;
my ($title, $subtitle, $url) = @_;
return test_zci(undef, structured_answer => {
data => {
link => $html,
input => $ticket_id
title => $title,
subtitle => "JIRA Ticket Lookup: $subtitle",
url => $url
},
templates => {
group => 'text',
options => {
content => 'DDH.jira.content'
}
group => 'info',
}
});
}
ddg_goodie_test(
[qw( DDG::Goodie::Jira)],
'ACE-230' => build_test(
qq(ACE (Apache JIRA Bugtracker): see ticket <a href="https://issues.apache.org/jira/browse/ACE-230">ACE-230</a>.),
'ACE-230'
),
'ace-230' => build_test(
qq(ACE (Apache JIRA Bugtracker): see ticket <a href="https://issues.apache.org/jira/browse/ACE-230">ACE-230</a>.),
'ACE-230'
),
'jira random AJLIB-230 bug random' => build_test(
qq(ajlib incubator (Codehaus JIRA Bugtracker): see ticket <a href="https://jira.codehaus.org/browse/AJLIB-230">AJLIB-230</a>.),
'AJLIB-230'
),
'jira random ajlib-230 bug random' => build_test(
qq(ajlib incubator (Codehaus JIRA Bugtracker): see ticket <a href="https://jira.codehaus.org/browse/AJLIB-230">AJLIB-230</a>.),
'AJLIB-230'
),
'SOLR-4530' => build_test(
'Solr (Apache JIRA Bugtracker): see ticket <a href="https://issues.apache.org/jira/browse/SOLR-4530">SOLR-4530</a>.',
'SOLR-4530'
),
'IdentityHtmlMapper solr-4530' => build_test(
'Solr (Apache JIRA Bugtracker): see ticket <a href="https://issues.apache.org/jira/browse/SOLR-4530">SOLR-4530</a>.',
'SOLR-4530'
),
'ACE-230' => build_test("ACE (Apache JIRA Bugtracker)", 'ACE-230', "https://issues.apache.org/jira/browse/ACE-230"),
'ace-230' => build_test("ACE (Apache JIRA Bugtracker)", 'ACE-230', "https://issues.apache.org/jira/browse/ACE-230"),
'jira random AJLIB-230 bug random' => build_test("ajlib incubator (Codehaus JIRA Bugtracker)", 'AJLIB-230', "https://jira.codehaus.org/browse/AJLIB-230"),
'jira random ajlib-230 bug random' => build_test("ajlib incubator (Codehaus JIRA Bugtracker)", 'AJLIB-230', "https://jira.codehaus.org/browse/AJLIB-230"),
'SOLR-4530' => build_test("Solr (Apache JIRA Bugtracker)", 'SOLR-4530', "https://issues.apache.org/jira/browse/SOLR-4530"),
'IdentityHtmlMapper solr-4530' => build_test('Solr (Apache JIRA Bugtracker)', 'SOLR-4530', "https://issues.apache.org/jira/browse/SOLR-4530"),
);
done_testing;