Author: sartak
Date: Thu Sep 13 15:58:47 2007
New Revision: 9045
Added:
rt/branches/3.7-EXPERIMENTAL/html/Elements/GnuPGKeyIssues
Modified:
rt/branches/3.7-EXPERIMENTAL/ (props changed)
rt/branches/3.7-EXPERIMENTAL/html/Ticket/Create.html
rt/branches/3.7-EXPERIMENTAL/html/Ticket/Update.html
rt/branches/3.7-EXPERIMENTAL/t/web/gnupg-select-keys-on-create.t
rt/branches/3.7-EXPERIMENTAL/t/web/gnupg-select-keys-on-update.t
Log:
r42654 at onn: sartak | 2007-09-13 15:58:26 -0400
Factor GnuPGKeyIssues out of Ticket/Create and Ticket/Update
Added: rt/branches/3.7-EXPERIMENTAL/html/Elements/GnuPGKeyIssues
==============================================================================
--- (empty file)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/GnuPGKeyIssues Thu Sep 13 15:58:47 2007
@@ -0,0 +1,77 @@
+%# BEGIN BPS TAGGED BLOCK {{{
+%#
+%# COPYRIGHT:
+%#
+%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC
+%# <jesse at bestpractical.com>
+%#
+%# (Except where explicitly superseded by other copyright notices)
+%#
+%#
+%# LICENSE:
+%#
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%#
+%# This work is distributed in the hope that it will be useful, but
+%# WITHOUT ANY WARRANTY; without even the implied warranty of
+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+%# General Public License for more details.
+%#
+%# You should have received a copy of the GNU General Public License
+%# along with this program; if not, write to the Free Software
+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+%# 02110-1301 or visit their web page on the internet at
+%# http://www.gnu.org/copyleft/gpl.html.
+%#
+%#
+%# CONTRIBUTION SUBMISSION POLICY:
+%#
+%# (The following paragraph is not intended to limit the rights granted
+%# to you to modify and distribute this software under the terms of
+%# the GNU General Public License and is only of importance to you if
+%# you choose to contribute your changes and enhancements to the
+%# community by submitting them to Best Practical Solutions, LLC.)
+%#
+%# By intentionally submitting any modifications, corrections or
+%# derivatives to this work, or any other work intended for use with
+%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable,
+%# royalty-free, perpetual, license to use, copy, create derivative
+%# works based on those contributions, and sublicense and distribute
+%# those contributions and any derivatives thereof.
+%#
+%# END BPS TAGGED BLOCK }}}
+% if ( @$Issues ) {
+<&| /Widgets/TitleBox, title => loc('GnuPG issues') &>
+<% loc("You are going to encrypt outgoing email messages, but there is a problem(s) with recipients' public keys. You have to figure out problems with keys, disable sending a message to some recipients or disable encryption.") %>
+
+<ul>
+% foreach my $issue ( @$Issues ) {
+<li>
+% if ( $issue->{'User'} ) {
+User <a href="<% RT->Config->Get('WebPath') %>/Admin/Users/Modify.html?id=<% $issue->{'User'}->id %>"><&/Elements/ShowUser, User => $issue->{'User'} &></a> has a problem.
+% } else {
+There is a problem with key(s) for address <% $issue->{'EmailAddress'} %>, but there is no user in the DB for this address.
+% }
+<% $issue->{'Message'} %>
+<br />
+Select a key you want to use for encryption:
+<& /Elements/SelectKey,
+ Name => 'UseKey-'. $issue->{'EmailAddress'},
+ EmailAddress => $issue->{'EmailAddress'},
+ Default => ( $issue->{'User'}? $issue->{'User'}->PreferredKey : undef ),
+&>
+</li>
+% }
+</ul>
+</&>
+% }
+
+<%ARGS>
+$Issues => []
+</%ARGS>
+
Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Create.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Create.html (original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Create.html Thu Sep 13 15:58:47 2007
@@ -57,31 +57,7 @@
<input type="hidden" class="hidden" name="id" value="new" />
% $m->callback( CallbackName => 'FormStart', ARGSRef => \%ARGS );
-% if ( @gnupg_keys_issues ) {
-<&| /Widgets/TitleBox, title => loc('GnuPG issues') &>
-<% loc("You are going to encrypt outgoing email messages, but there is a problem(s) with recipients' public keys. You have to figure out problems with keys, disable sending a message to some recipients or disable encryption.") %>
-
-<ul>
-% foreach my $issue ( @gnupg_keys_issues ) {
-<li>
-% if ( $issue->{'User'} ) {
-User <a href="<% RT->Config->Get('WebPath') %>/Admin/Users/Modify.html?id=<% $issue->{'User'}->id %>"><&/Elements/ShowUser, User => $issue->{'User'} &></a> has a problem.
-% } else {
-There is a problem with key(s) for address <% $issue->{'EmailAddress'} %>, but there is no user in the DB for this address.
-% }
-<% $issue->{'Message'} %>
-<br />
-Select a key you want to use for encryption:
-<& /Elements/SelectKey,
- Name => 'UseKey-'. $issue->{'EmailAddress'},
- EmailAddress => $issue->{'EmailAddress'},
- Default => ( $issue->{'User'}? $issue->{'User'}->PreferredKey : undef ),
-&>
-</li>
-% }
-</ul>
-</&>
-% }
+<& /Elements/GnuPGKeyIssues, Issues => \@gnupg_keys_issues &>
<div id="Ticket-Create-basics">
<a name="basics"></a>
Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Update.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Update.html (original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Update.html Thu Sep 13 15:58:47 2007
@@ -60,31 +60,7 @@
<input type="hidden" class="hidden" name="DefaultStatus" value="<% $DefaultStatus ||''%>" />
<input type="hidden" class="hidden" name="Action" value="<% $ARGS{Action}||'' %>" />
-% if ( @gnupg_keys_issues ) {
-<&| /Widgets/TitleBox, title => loc('GnuPG issues') &>
-<% loc("You are going to encrypt outgoing email messages, but there is a problem(s) with recipients' public keys. You have to figure out problems with keys, disable sending a message to some recipients or disable encryption.") %>
-
-<ul>
-% foreach my $issue ( @gnupg_keys_issues ) {
-<li>
-% if ( $issue->{'User'} ) {
-User <a href="<% RT->Config->Get('WebPath') %>/Admin/Users/Modify.html?id=<% $issue->{'User'}->id %>"><&/Elements/ShowUser, User => $issue->{'User'} &></a> has a problem.
-% } else {
-There is a problem with key(s) for address <% $issue->{'EmailAddress'} %>, but there is no user in the DB for this address.
-% }
-<% $issue->{'Message'} %>
-<br />
-Select a key you want to use for encryption:
-<& /Elements/SelectKey,
- Name => 'UseKey-'. $issue->{'EmailAddress'},
- EmailAddress => $issue->{'EmailAddress'},
- Default => ( $issue->{'User'}? $issue->{'User'}->PreferredKey : undef ),
-&>
-</li>
-% }
-</ul>
-</&>
-% }
+<& /Elements/GnuPGKeyIssues, Issues => \@gnupg_keys_issues &>
<table border="0">
Modified: rt/branches/3.7-EXPERIMENTAL/t/web/gnupg-select-keys-on-create.t
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/t/web/gnupg-select-keys-on-create.t (original)
+++ rt/branches/3.7-EXPERIMENTAL/t/web/gnupg-select-keys-on-create.t Thu Sep 13 15:58:47 2007
@@ -37,7 +37,7 @@
RT::Test->set_rights(
Principal => 'Everyone',
- Right => ['CreateTicket', 'ShowTicket', 'SeeQueue', 'ReplyTicket', 'ModifyTicket'],
+ Right => ['CreateTicket', 'ShowTicket', 'SeeQueue', 'ReplyToTicket', 'ModifyTicket'],
);
my ($baseurl, $m) = RT::Test->started_ok;
Modified: rt/branches/3.7-EXPERIMENTAL/t/web/gnupg-select-keys-on-update.t
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/t/web/gnupg-select-keys-on-update.t (original)
+++ rt/branches/3.7-EXPERIMENTAL/t/web/gnupg-select-keys-on-update.t Thu Sep 13 15:58:47 2007
@@ -37,7 +37,7 @@
RT::Test->set_rights(
Principal => 'Everyone',
- Right => ['CreateTicket', 'ShowTicket', 'SeeQueue', 'ReplyTicket', 'ModifyTicket'],
+ Right => ['CreateTicket', 'ShowTicket', 'SeeQueue', 'ReplyToTicket', 'ModifyTicket'],
);
my ($baseurl, $m) = RT::Test->started_ok;