[Rt-commit] rt branch, master, updated. rt-4.0.0rc4-78-g512d065
Alex Vandiver
alexmv at bestpractical.com
Fri Feb 4 15:57:27 EST 2011
The branch, master has been updated
via 512d065cabb21c5d8e4afd807bc2638b49277c97 (commit)
from 9adb5f8242a004f01cb26c6155443b696dbb841e (commit)
Summary of changes:
lib/RT/Interface/Web.pm | 9 +----
lib/RT/Reminders.pm | 3 +-
share/html/Elements/Tabs | 2 +-
share/html/Ticket/Elements/Reminders | 9 +----
share/html/Ticket/Elements/ShowSummary | 2 -
share/html/Ticket/Reminders.html | 6 +---
t/web/reminders-permissions.t | 59 --------------------------------
7 files changed, 6 insertions(+), 84 deletions(-)
delete mode 100644 t/web/reminders-permissions.t
- Log -----------------------------------------------------------------
commit 512d065cabb21c5d8e4afd807bc2638b49277c97
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Fri Feb 4 15:55:37 2011 -0500
Revert b8b8a88..9adb5f8 to place them on a branch for further development
diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index 806d27d..7b3558c 100644
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -1990,17 +1990,12 @@ sub ProcessTicketReminders {
Format => 'unknown',
Value => $args->{'NewReminder-Due'}
);
- my ( $status, $msg ) = $Ticket->Reminders->Add(
+ my ( $add_id, $msg, $txnid ) = $Ticket->Reminders->Add(
Subject => $args->{'NewReminder-Subject'},
Owner => $args->{'NewReminder-Owner'},
Due => $due_obj->ISO
);
- if ( $status ) {
- push @results, loc("Reminder '[_1]' added", $args->{'NewReminder-Subject'});
- }
- else {
- push @results, $msg;
- }
+ push @results, loc("Reminder '[_1]' added", $args->{'NewReminder-Subject'});
}
return @results;
}
diff --git a/lib/RT/Reminders.pm b/lib/RT/Reminders.pm
index 58e19c9..c80fe83 100644
--- a/lib/RT/Reminders.pm
+++ b/lib/RT/Reminders.pm
@@ -117,8 +117,7 @@ sub Add {
);
my $reminder = RT::Ticket->new($self->CurrentUser);
- # the 2nd return value is txn id, which is useless here
- my ( $status, undef, $msg ) = $reminder->Create(
+ my ( $status, $msg ) = $reminder->Create(
Subject => $args{'Subject'},
Owner => $args{'Owner'},
Due => $args{'Due'},
diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index ebe221d..e85b059 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -473,7 +473,7 @@ my $build_admin_menu = sub {
$tabs->child( jumbo => title => loc('Jumbo'), path => "/Ticket/ModifyAll.html?id=" . $id, );
#}
- if ( RT->Config->Get('EnableReminders') && $can->('ModifyTicket') ) {
+ if ( RT->Config->Get('EnableReminders') ) {
$tabs->child( reminders => title => loc('Reminders'), path => "/Ticket/Reminders.html?id=" . $id, );
}
diff --git a/share/html/Ticket/Elements/Reminders b/share/html/Ticket/Elements/Reminders
index d618a87..bc2e7c4 100644
--- a/share/html/Ticket/Elements/Reminders
+++ b/share/html/Ticket/Elements/Reminders
@@ -75,9 +75,7 @@ my $reminder_collection = $count_reminders->Collection;
% if ( $Edit ) {
<th class="collection-as-table" colspan="5"><&|/l&>Reminders</&></th>
% } else {
-% if ( $Ticket->CurrentUserHasRight('ModifyTicket') ) {
<th class="collection-as-table"></th>
-% }
<th class="collection-as-table"><&|/l&>Reminder</&></th>
<th class="collection-as-table"><&|/l&>Due</&></th>
<th class="collection-as-table"><&|/l&>Owner</&></th>
@@ -99,7 +97,7 @@ my $reminder_collection = $count_reminders->Collection;
% }
% }
</table>
-% if ( $visible > 0 && $Ticket->CurrentUserHasRight('ModifyTicket') ) {
+% if ( $visible > 0 ) {
<i><&|/l&>(Check box to complete)</&></i><br /><br />
% }
% } else {
@@ -113,11 +111,8 @@ my $reminder_collection = $count_reminders->Collection;
% }
% }
-% if ( $Ticket->CurrentUserHasRight('ModifyTicket') ) {
<&|/l&>New reminder:</&>
<& SELF:NewReminder, Ticket => $Ticket &>
-% }
-
<%method NewReminder>
<%args>
$Ticket
@@ -165,9 +160,7 @@ $Index
% my $dueobj = $Reminder->DueObj;
% my $overdue = $dueobj->Unix > 0 && $dueobj->Diff < 0 ? 1 : 0;
<tr class="<% $Index%2 ? 'oddline' : 'evenline' %>">
-% if ( $Ticket->CurrentUserHasRight('ModifyTicket') ) {
<td class="collection-as-table"><input type="checkbox" value="1" name="Complete-Reminder-<% $Reminder->id %>" <% $Reminder->Status eq 'resolved' ? 'checked="checked"' : '' |n %> /></td>
-% }
<td class="collection-as-table"><% $Reminder->Subject %></td>
<td class="collection-as-table"><% $overdue ? '<span class="overdue">' : '' |n %><% $dueobj->AgeAsString || loc('Not set') %><% $overdue ? '</span>' : '' |n %></td>
<td class="collection-as-table"><& /Elements/ShowUser, User => $Reminder->OwnerObj &></td>
diff --git a/share/html/Ticket/Elements/ShowSummary b/share/html/Ticket/Elements/ShowSummary
index 31f55af..8d35fdf 100755
--- a/share/html/Ticket/Elements/ShowSummary
+++ b/share/html/Ticket/Elements/ShowSummary
@@ -77,9 +77,7 @@
<table><tr><td>
<form action="<%RT->Config->Get('WebPath')%>/Ticket/Display.html" name="UpdateReminders" id="UpdateReminders" method="post">
<& /Ticket/Elements/Reminders, Ticket => $Ticket, ShowCompleted => 0 &>
-% if ( $Ticket->CurrentUserHasRight('ModifyTicket') ) {
<div align="right"><input type="submit" class="button" value="<&|/l&>Save</&>" /></div>
-% }
</form>
</td></tr></table>
</&>
diff --git a/share/html/Ticket/Reminders.html b/share/html/Ticket/Reminders.html
index 32fd9b9..4508f5a 100755
--- a/share/html/Ticket/Reminders.html
+++ b/share/html/Ticket/Reminders.html
@@ -49,8 +49,6 @@
<& /Elements/Tabs &>
% $m->callback(CallbackName => 'BeforeActionList', ARGSRef => \%ARGS, Ticket => $Ticket);
-
-<& /Elements/ListActions, actions => \@actions &>
<form action="<%RT->Config->Get('WebPath')%>/Ticket/Reminders.html" name="UpdateReminders" id="UpdateReminders" method="post">
<&|/Widgets/TitleBox, title => loc("Reminders"),
@@ -66,10 +64,8 @@
<%INIT>
my $Ticket = LoadTicket($id);
-Abort( loc("Permission Denied") )
- unless $Ticket->CurrentUserHasRight('ModifyTicket');
-my @actions = ProcessTicketReminders( TicketObj => $Ticket, ARGSRef => \%ARGS );
+ProcessTicketReminders( TicketObj => $Ticket, ARGSRef => \%ARGS );
</%INIT>
<%ARGS>
$id => undef
diff --git a/t/web/reminders-permissions.t b/t/web/reminders-permissions.t
deleted file mode 100644
index ed7abc3..0000000
--- a/t/web/reminders-permissions.t
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use warnings;
-use RT::Test tests => 22;
-
-my $user_a = RT::Test->load_or_create_user(
- Name => 'user_a',
- Password => 'password',
-);
-
-ok( $user_a && $user_a->id, 'created user_a' );
-ok(
- RT::Test->add_rights(
- {
- Principal => $user_a,
- Right => [
- qw/SeeQueue CreateTicket ShowTicket/
- ]
- },
- ),
- 'add basic rights for user_a'
-);
-
-my $ticket = RT::Test->create_ticket(
- Subject => 'test reminder permission',
- Queue => 'General',
-);
-
-ok( $ticket->id, 'created a ticket' );
-
-my ($baseurl, $m) = RT::Test->started_ok;
-ok($m->login( user_a => 'password'), 'logged in as user_a');
-
-$m->goto_ticket($ticket->id);
-$m->content_lacks('New reminder:', 'can not create a new reminder');
-ok( !$m->find_link(id => 'page-reminders'), 'no like to Reminders page' );
-$m->get_ok( $baseurl . '/Ticket/Reminders.html?id=' . $ticket->id );
-$m->title_is("RT Error", 'got rt error');
-$m->warning_like(qr/Permission Denied/, 'got permission denied warning');
-$m->content_contains('Permission Denied', 'got permission denied msg');
-
-ok(
- RT::Test->add_rights(
- {
- Principal => $user_a,
- Right => [
- qw/ModifyTicket/
- ]
- },
- ),
- 'add basic rights for user_a'
-);
-$m->goto_ticket($ticket->id);
-$m->content_contains('New reminder:', 'can create a new reminder');
-$m->follow_link_ok({id => 'page-reminders'});
-$m->title_is("Reminders for ticket #" . $ticket->id);
-$m->content_contains('New reminder:', 'can create a new reminder');
-$m->content_lacks('Permission Denied', 'no permission denied msg');
-
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list