[Rt-commit] [svn] r1092 - in rt/branches/rt-3.1: . bin etc
html/Admin/Elements html/Admin/Users html/Elements
html/REST/1.0/NoAuth html/Ticket html/Ticket/Elements lib
lib/RT lib/RT/Action lib/RT/Interface
jesse at pallas.eruditorum.org
jesse at pallas.eruditorum.org
Wed Jun 16 20:52:14 EDT 2004
Author: jesse
Date: Wed Jun 16 20:52:13 2004
New Revision: 1092
Modified:
rt/branches/rt-3.1/ (props changed)
rt/branches/rt-3.1/Makefile.in
rt/branches/rt-3.1/bin/rt-crontool.in
rt/branches/rt-3.1/etc/acl.mysql
rt/branches/rt-3.1/html/Admin/Elements/UserTabs
rt/branches/rt-3.1/html/Admin/Users/Modify.html
rt/branches/rt-3.1/html/Elements/Header
rt/branches/rt-3.1/html/REST/1.0/NoAuth/mail-gateway
rt/branches/rt-3.1/html/Ticket/Create.html
rt/branches/rt-3.1/html/Ticket/Elements/ShowDates
rt/branches/rt-3.1/html/Ticket/Elements/ShowHistory
rt/branches/rt-3.1/lib/RT.pm.in
rt/branches/rt-3.1/lib/RT/Action/EscalatePriority.pm
rt/branches/rt-3.1/lib/RT/CurrentUser.pm
rt/branches/rt-3.1/lib/RT/Interface/Email.pm
rt/branches/rt-3.1/lib/RT/Link_Overlay.pm
rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
Log:
----------------------------------------------------------------------
r1835 at debian: jesse | 2004-06-17T08:42:54.935871Z
r1837 at debian: jesse | 2004-06-17T09:51:45.205797Z
Merged forward from 3.0
Modified: rt/branches/rt-3.1/Makefile.in
==============================================================================
--- rt/branches/rt-3.1/Makefile.in (original)
+++ rt/branches/rt-3.1/Makefile.in Wed Jun 16 20:52:13 2004
@@ -79,6 +79,7 @@
RT_DOC_PATH = @RT_DOC_PATH@
RT_LOCAL_PATH = @RT_LOCAL_PATH@
LOCAL_ETC_PATH = @LOCAL_ETC_PATH@
+LOCAL_LIB_PATH = @LOCAL_LIB_PATH@
LOCAL_LEXICON_PATH = @LOCAL_LEXICON_PATH@
MASON_HTML_PATH = @MASON_HTML_PATH@
MASON_LOCAL_HTML_PATH = @MASON_LOCAL_HTML_PATH@
@@ -120,7 +121,6 @@
$(SETGID_BINARIES)
SYSTEM_BINARIES = $(DESTDIR)/$(RT_SBIN_PATH)/
-
# }}}
# {{{ Database setup
@@ -295,6 +295,7 @@
mkdir -p $(DESTDIR)/$(MASON_HTML_PATH)
mkdir -p $(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
mkdir -p $(DESTDIR)/$(LOCAL_ETC_PATH)
+ mkdir -p $(DESTDIR)/$(LOCAL_LIB_PATH)
mkdir -p $(DESTDIR)/$(LOCAL_LEXICON_PATH)
# }}}
Modified: rt/branches/rt-3.1/bin/rt-crontool.in
==============================================================================
--- rt/branches/rt-3.1/bin/rt-crontool.in (original)
+++ rt/branches/rt-3.1/bin/rt-crontool.in Wed Jun 16 20:52:13 2004
@@ -68,7 +68,7 @@
"help" => \$help,
"verbose|v" => \$verbose );
-help() if $help;
+help() if $help or not @ARGV or not $action;
# We _must_ have a search object
load_module($search);
Modified: rt/branches/rt-3.1/etc/acl.mysql
==============================================================================
--- rt/branches/rt-3.1/etc/acl.mysql (original)
+++ rt/branches/rt-3.1/etc/acl.mysql Wed Jun 16 20:52:13 2004
@@ -3,6 +3,6 @@
"USE mysql;",
"DELETE FROM user WHERE user = '${RT::DatabaseUser}';",
"DELETE FROM db where db = '${RT::DatabaseName}';",
-"GRANT SELECT,INSERT,CREATE,INDEX,UPDATE,DELETE ON ${RT::DatabaseName}.* TO ${RT::DatabaseUser}\@${RT::DatabaseRTHost} IDENTIFIED BY '${RT::DatabasePassword}';");
+"GRANT SELECT,INSERT,CREATE,INDEX,UPDATE,DELETE ON ${RT::DatabaseName}.* TO ${RT::DatabaseUser}\@'${RT::DatabaseRTHost}' IDENTIFIED BY '${RT::DatabasePassword}';");
}
1;
Modified: rt/branches/rt-3.1/html/Admin/Elements/UserTabs
==============================================================================
--- rt/branches/rt-3.1/html/Admin/Elements/UserTabs (original)
+++ rt/branches/rt-3.1/html/Admin/Elements/UserTabs Wed Jun 16 20:52:13 2004
@@ -21,54 +21,60 @@
%#
%#
%# END LICENSE BLOCK
-<& /Admin/Elements/Tabs,
+<& /Admin/Elements/Tabs,
subtabs => $tabs,
- current_tab => 'Admin/Users/',
- current_subtab => $current_subtab,
+ current_tab => 'Admin/Users/',
+ current_subtab => $current_tab,
Title => $Title &>
<%INIT>
my $tabs;
-my $subtabs;
if ($id) {
-$tabs->{'this'} = { title => eval { $UserObj->Name },
-
- path => "Admin/Users/Modify.html?id=".$id,
-subtabs => {
- Queues => { title => loc('Basics'),
- path => "Admin/Users/Modify.html?id=".$id
- },
-# Scrips => { title => loc('Rights'),
-# path => "Admin/Users/Rights.html?id=".$id
-# }
-
- }
+ $tabs->{'this'} = {
+ title => eval { $UserObj->Name },
+ path => "Admin/Users/Modify.html?id=".$id,
+ current_subtab => $current_tab,
+ subtabs => {
+ A => { title => loc('Basics'),
+ path => "Admin/Users/Modify.html?id=".$id
+ },
+ D => { title => loc('MemberOf'),
+ path => "Admin/Users/MemberOf.html?id=".$id
+ },
+ }
+ }
}
+
+if ( $session{'CurrentUser'}->HasRight( Object => $RT::System, Right => 'AdminUsers') ) {
+ $tabs->{"A"} = {
+ title => loc('Select user'),
+ path => "Admin/Users/",
+ };
+ $tabs->{"B"} = {
+ title => loc('New user'),
+ path => "Admin/Users/Modify.html?Create=1",
+ separator => 1,
+ };
}
-if ($session{'CurrentUser'}->HasRight( Object => $RT::System, Right => 'AdminUsers')) {
- $tabs->{"A"} = { title => loc('Select user'),
- path => "Admin/Users/",
- };
- $tabs->{"B"} = { title => loc('New user'),
- path => "Admin/Users/Modify.html?Create=1",
- separator => 1,
- };
+
+# Now let callbacks add their extra tabs
+$m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
+
+foreach my $tab ( sort keys %{$tabs->{'this'}->{'subtabs'}} ) {
+ if ( $tabs->{'this'}->{'subtabs'}->{$tab}->{'path'} eq $current_tab ) {
+ $tabs->{'this'}->{"current_subtab"} = $current_tab;
+ $tabs->{'this'}->{'subtabs'}->{$tab}->{"current_subtab"} = $current_subtab;
+ $tabs->{'this'}->{'subtabs'}->{$tab}->{"subtabs"} = $subtabs;
+ }
}
- # Now let callbacks add their extra tabs
- $m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
-
-foreach my $tab ( sort keys %{$tabs} ) {
- if ( $tabs->{$tab}->{'path'} eq $current_subtab ) {
- $tabs->{$tab}->{"current_subtab"} = $current_subtab;
- }
-}
+$current_tab = "Admin/Users/Modify.html?id=".$id if $id;
+
</%INIT>
-
-
<%ARGS>
$UserObj => undef
$id => undef
$current_tab => undef
+$subtabs => undef
$current_subtab => undef
$Title => undef
</%ARGS>
Modified: rt/branches/rt-3.1/html/Admin/Users/Modify.html
==============================================================================
--- rt/branches/rt-3.1/html/Admin/Users/Modify.html (original)
+++ rt/branches/rt-3.1/html/Admin/Users/Modify.html Wed Jun 16 20:52:13 2004
@@ -25,7 +25,7 @@
<& /Admin/Elements/UserTabs,
id => $id,
UserObj => $UserObj,
- current_subtab => $current_tab,
+ current_tab => $current_tab,
Title => $title &>
<& /Elements/ListActions, actions => \@results &>
@@ -269,8 +269,6 @@
$Create = 1;
}
-
-
}
Modified: rt/branches/rt-3.1/html/Elements/Header
==============================================================================
--- rt/branches/rt-3.1/html/Elements/Header (original)
+++ rt/branches/rt-3.1/html/Elements/Header Wed Jun 16 20:52:13 2004
@@ -70,7 +70,6 @@
% } else {
<&|/l&>Not logged in.</&>
% }
-</font>
</td>
</tr>
</table>
Modified: rt/branches/rt-3.1/html/REST/1.0/NoAuth/mail-gateway
==============================================================================
--- rt/branches/rt-3.1/html/REST/1.0/NoAuth/mail-gateway (original)
+++ rt/branches/rt-3.1/html/REST/1.0/NoAuth/mail-gateway Wed Jun 16 20:52:13 2004
@@ -35,7 +35,7 @@
inherit => undef # inhibit UTF8 conversion done in /autohandler
</%flags>
% if ($status == -75 ) {
-temporary failure
+temporary failure - <% $error %>
% }
% elsif ($status == 1) {
ok
Modified: rt/branches/rt-3.1/html/Ticket/Create.html
==============================================================================
--- rt/branches/rt-3.1/html/Ticket/Create.html (original)
+++ rt/branches/rt-3.1/html/Ticket/Create.html Wed Jun 16 20:52:13 2004
@@ -152,8 +152,8 @@
<TABLE BORDER=0>
<TR><TD ALIGN=RIGHT><&|/l&>Priority</&>:</TD><TD><input size=3 name="InitialPriority" value="<% $ARGS{InitialPriority} ? $ARGS{InitialPriority} : $QueueObj->InitialPriority %>"></TD></TR>
<TR><TD ALIGN=RIGHT><&|/l&>Final Priority</&>:</TD><TD><input size=3 name="FinalPriority" value="<% $ARGS{FinalPriority} ? $ARGS{FinalPriority} : $QueueObj->FinalPriority %>"></TD></TR>
-<TR><TD ALIGN=RIGHT><&|/l&>Time Worked</&>:</TD><TD><input size=3 name="TimeWorked" value="<% $ARGS{TimeWorked} %>"></TD></TR>
-<TR><TD ALIGN=RIGHT><&|/l&>Time Left</&>:</TD><TD><input size=3 name="TimeLeft" value="<% $ARGS{TimeLeft} %>"></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Time Worked</&>:</TD><TD><&|/l,'<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">'&>[_1] min</&></TD></TR>
+<TR><TD ALIGN=RIGHT><&|/l&>Time Left</&>:</TD><TD><&|/l,'<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">'&>[_1] min</&></TD></TR>
</TABLE>
<& /Elements/TitleBoxEnd &>
<br>
@@ -208,7 +208,9 @@
$QueueObj->Load($Queue) || Abort(loc("Queue could not be loaded."));
my $CFs = $QueueObj->CustomFields();
-if ($QueueObj->DefaultDueIn) {
+# if no due date has been set explicitly, then use the
+# queue's default if it exists
+if ($QueueObj->DefaultDueIn && !$ARGS{'Due'}) {
my $default_due = RT::Date->new($session{'CurrentUser'});
$default_due->SetToNow();
$default_due->AddDays($QueueObj->DefaultDueIn);
Modified: rt/branches/rt-3.1/html/Ticket/Elements/ShowDates
==============================================================================
--- rt/branches/rt-3.1/html/Ticket/Elements/ShowDates (original)
+++ rt/branches/rt-3.1/html/Ticket/Elements/ShowDates Wed Jun 16 20:52:13 2004
@@ -36,7 +36,7 @@
<TD class="value"><% $Ticket->StartedObj->AsString %></TD>
</TR>
<TR>
- <TD class="label"><a href="Display.html?id=<%$Ticket->id%>&Action=SetTold"><&|/l&>Last Contact</&></a>:</TD>
+ <TD class="label"><a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$Ticket->id%>&Action=SetTold"><&|/l&>Last Contact</&></a>:</TD>
<TD class="value"><% $Ticket->ToldObj->AsString %></TD>
</TR>
<TR>
Modified: rt/branches/rt-3.1/html/Ticket/Elements/ShowHistory
==============================================================================
--- rt/branches/rt-3.1/html/Ticket/Elements/ShowHistory (original)
+++ rt/branches/rt-3.1/html/Ticket/Elements/ShowHistory Wed Jun 16 20:52:13 2004
@@ -120,7 +120,7 @@
</%INIT>
<%ARGS>
-$URIFile => 'Display.html'
+$URIFile => $RT::WebPath."/Ticket/Display.html"
$Ticket => undef
$Tickets => undef
$Attachments => undef
Modified: rt/branches/rt-3.1/lib/RT.pm.in
==============================================================================
--- rt/branches/rt-3.1/lib/RT.pm.in (original)
+++ rt/branches/rt-3.1/lib/RT.pm.in Wed Jun 16 20:52:13 2004
@@ -33,7 +33,6 @@
use vars qw($VERSION $System $SystemUser $Nobody $Handle $Logger
$CORE_CONFIG_FILE
$SITE_CONFIG_FILE
- $VENDOR_CONFIG_FILE
$BasePath
$EtcPath
$VarPath
@@ -96,7 +95,6 @@
=item LoadConfig
Load RT's config file. First, go after the core config file.
-After that, try to load the vendor config.
After that, go after the site config.
=cut
Modified: rt/branches/rt-3.1/lib/RT/Action/EscalatePriority.pm
==============================================================================
--- rt/branches/rt-3.1/lib/RT/Action/EscalatePriority.pm (original)
+++ rt/branches/rt-3.1/lib/RT/Action/EscalatePriority.pm Wed Jun 16 20:52:13 2004
@@ -27,9 +27,10 @@
=head1 DESCRIPTION
-EscalatePriority is a ScripAction which is NOT intended to be called per
-transaction. It's intended to be called by an RT escalation daemon.
-(The daemon is called escalator).
+EscalatePriority is a ScripAction which is NOT intended to be called
+per transaction. It's intended to be called by an RT escalation tool.
+One such tool is called rt-crontool and is located in $RTHOME/bin (see
+C<rt-crontool -h> for more details)
EsclatePriority uses the following formula to change a ticket's priority:
Modified: rt/branches/rt-3.1/lib/RT/CurrentUser.pm
==============================================================================
--- rt/branches/rt-3.1/lib/RT/CurrentUser.pm (original)
+++ rt/branches/rt-3.1/lib/RT/CurrentUser.pm Wed Jun 16 20:52:13 2004
@@ -252,9 +252,9 @@
$self->SUPER::LoadById($identifier);
}
- elsif (UNIVERSAL::isa($identifier,"RT::User")) {
- # DWIM if they pass a user in
- $self->SUPER::LoadById($identifier->Id);
+ elsif (UNIVERSAL::isa($identifier,"RT::User")) {
+ # DWIM if they pass a user in
+ $self->SUPER::LoadById($identifier->Id);
}
else {
# This is a bit dangerous, we might get false authen if somebody
Modified: rt/branches/rt-3.1/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/rt-3.1/lib/RT/Interface/Email.pm (original)
+++ rt/branches/rt-3.1/lib/RT/Interface/Email.pm Wed Jun 16 20:52:13 2004
@@ -57,7 +57,7 @@
=head1 NAME
- RT::Interface::CLI - helper functions for creating a commandline RT interface
+ RT::Interface::Email - helper functions for parsing email sent to RT
=head1 SYNOPSIS
@@ -376,6 +376,9 @@
designed to be called from the web interface with a message, user
object, and so on.
+Can also take an optional 'ticket' parameter; this ticket id overrides
+any ticket id found in the subject.
+
Returns:
An array of:
Modified: rt/branches/rt-3.1/lib/RT/Link_Overlay.pm
==============================================================================
--- rt/branches/rt-3.1/lib/RT/Link_Overlay.pm (original)
+++ rt/branches/rt-3.1/lib/RT/Link_Overlay.pm Wed Jun 16 20:52:13 2004
@@ -81,10 +81,9 @@
my $base = RT::URI->new( $self->CurrentUser );
$base->FromURI( $args{'Base'} );
- unless ( $base->Scheme ) {
+ unless ( $base->Resolver and $base->Scheme ) {
$RT::Logger->warning( "$self couldn't resolve base:'"
. $args{'Base'} . " - "
- . $base->Scheme
. "' into a URI\n" );
return (undef);
Modified: rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm (original)
+++ rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm Wed Jun 16 20:52:13 2004
@@ -554,7 +554,10 @@
unless ( exists $params{$attr} && $params{$attr} );
}
- my ( $id, $ticket_message ) = $self->SUPER::Create(%params);
+ # Delete the time worked if we're counting it in the transaction
+ delete $params{TimeWorked} if $args{'_RecordTransaction'};
+
+ my ($id,$ticket_message) = $self->SUPER::Create( %params);
unless ($id) {
$RT::Logger->crit( "Couldn't create a ticket: " . $ticket_message );
$RT::Handle->Rollback();
@@ -682,9 +685,9 @@
# {{{ Add a transaction for the create
my ( $Trans, $Msg, $TransObj ) = $self->_NewTransaction(
- Type => "Create",
- TimeTaken => 0,
- MIMEObj => $args{'MIMEObj'}
+ Type => "Create",
+ TimeTaken => $args{'TimeWorked'},
+ MIMEObj => $args{'MIMEObj'}
);
if ( $self->Id && $Trans ) {
More information about the Rt-commit
mailing list