[Rt-commit] r6907 - in rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html:
Admin/Tools/Shredder/Elements/Object SelfService Ticket/Elements
ruz at bestpractical.com
ruz at bestpractical.com
Fri Feb 2 17:14:34 EST 2007
Author: ruz
Date: Fri Feb 2 17:14:34 2007
New Revision: 6907
Modified:
rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment
rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/Admin/Tools/Shredder/Elements/Object/RT--Ticket
rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/Admin/Tools/Shredder/Elements/Object/RT--User
rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/Admin/Tools/Shredder/index.html
rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/SelfService/Closed.html
rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/SelfService/Display.html
rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/SelfService/index.html
rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/Ticket/Elements/LoadTextAttachments
Log:
* switch to new config style
Modified: rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment (original)
+++ rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment Fri Feb 2 17:14:34 2007
@@ -1,6 +1,6 @@
<%ARGS>
$Object => undef
</%ARGS>
-<a href="<% $RT::WebBaseURL %>/Ticket/Attachment/<% $Object->TransactionId %>/<% $Object->id %>/">
+<a href="<% RT->Config->Get('WebBaseURL') %>/Ticket/Attachment/<% $Object->TransactionId %>/<% $Object->id %>/">
Attachment(id:<% $Object->id %>, FileName: <% $Object->Filename || '(no value)' %>)
</a>
Modified: rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/Admin/Tools/Shredder/Elements/Object/RT--Ticket
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/Admin/Tools/Shredder/Elements/Object/RT--Ticket (original)
+++ rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/Admin/Tools/Shredder/Elements/Object/RT--Ticket Fri Feb 2 17:14:34 2007
@@ -1,6 +1,6 @@
<%ARGS>
$Object => undef
</%ARGS>
-<a href="<% $RT::WebBaseURL %>/Ticket/Display.html?id=<% $Object->id %>">
+<a href="<% RT->Config->Get('WebBaseURL') %>/Ticket/Display.html?id=<% $Object->id %>">
Ticket(id:<% $Object->id %>, Subject: <% substr($Object->Subject, 0, 30) %>...)
</a>
Modified: rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/Admin/Tools/Shredder/Elements/Object/RT--User
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/Admin/Tools/Shredder/Elements/Object/RT--User (original)
+++ rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/Admin/Tools/Shredder/Elements/Object/RT--User Fri Feb 2 17:14:34 2007
@@ -1,6 +1,6 @@
<%ARGS>
$Object => undef
</%ARGS>
-<a href="<% $RT::WebBaseURL %>/Admin/Users/Modify.html?id=<% $Object->id %>">
+<a href="<% RT->Config->Get('WebBaseURL') %>/Admin/Users/Modify.html?id=<% $Object->id %>">
User(id:<% $Object->id %>, Name: <% $Object->Name %>)
</a>
Modified: rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/Admin/Tools/Shredder/index.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/Admin/Tools/Shredder/index.html (original)
+++ rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/Admin/Tools/Shredder/index.html Fri Feb 2 17:14:34 2007
@@ -10,7 +10,7 @@
current_subtab => 'Admin/Tools/Shredder',
Title => $title,
&>
-<form id="shredder-search-form" action="<% $RT::WebPath %>/Admin/Tools/Shredder/" method="GET">
+<form id="shredder-search-form" action="<% RT->Config->Get('WebPath') %>/Admin/Tools/Shredder/" method="GET">
<div id="shredder-select-plugin">
<& /Elements/ListActions, actions => $messages{'Errors'} &>
<& /Elements/ListActions, actions => $messages{'Success'} &>
Modified: rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/SelfService/Closed.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/SelfService/Closed.html (original)
+++ rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/SelfService/Closed.html Fri Feb 2 17:14:34 2007
@@ -45,10 +45,12 @@
%# END BPS TAGGED BLOCK }}}
<& /SelfService/Elements/Header, Title => loc('Closed tickets') &>
-<& /SelfService/Elements/MyRequests, status => ['rejected', 'resolved'],
- friendly_status => loc('closed'),
- BaseURL => $RT::WebPath . "/SelfService/Closed.html?",
- Page => $Page &>
+<& /SelfService/Elements/MyRequests,
+ status => ['rejected', 'resolved'],
+ friendly_status => loc('closed'),
+ BaseURL => RT->Config->Get('WebPath') ."/SelfService/Closed.html?",
+ Page => $Page,
+&>
<%ARGS>
$Page => 1
</%ARGS>
Modified: rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/SelfService/Display.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/SelfService/Display.html (original)
+++ rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/SelfService/Display.html Fri Feb 2 17:14:34 2007
@@ -204,8 +204,9 @@
# resubmission on refresh.
# But we need to store Actions somewhere too, so we don't lose them.
$session{"Actions"} = \@results;
- RT::Interface::Web::Redirect($RT::WebURL."SelfService/Display.html?id="
- . $Ticket->id);
+ RT::Interface::Web::Redirect(
+ RT->Config->Get('WebURL') ."SelfService/Display.html?id=". $Ticket->id
+ );
} else {
@results = @{ delete $session{"Actions"} || [] };
}
Modified: rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/SelfService/index.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/SelfService/index.html (original)
+++ rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/SelfService/index.html Fri Feb 2 17:14:34 2007
@@ -44,9 +44,11 @@
%#
%# END BPS TAGGED BLOCK }}}
<& /SelfService/Elements/Header, Title => loc('Open Tickets') &>
+<& /SelfService/Elements/MyRequests,
+ BaseURL => RT->Config->Get('WebPath') ."/SelfService/?",
+ Page => $Page,
+&>
-<& /SelfService/Elements/MyRequests, BaseURL => $RT::WebPath . "/SelfService/?",
- Page => $Page &>
<%ARGS>
$Page => 1
</%ARGS>
Modified: rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/Ticket/Elements/LoadTextAttachments
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/Ticket/Elements/LoadTextAttachments (original)
+++ rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/html/Ticket/Elements/LoadTextAttachments Fri Feb 2 17:14:34 2007
@@ -80,9 +80,8 @@
$attachments->Limit ( FIELD => 'ContentType', OPERATOR => '=', VALUE => 'text/plain');
$attachments->Limit ( FIELD => 'ContentType', OPERATOR => 'STARTSWITH', VALUE => 'message/');
$attachments->Limit ( FIELD => 'ContentType', OPERATOR => '=', VALUE => 'text');
- if ($RT::SuppressInlineTextFiles) {
- $attachments->Limit ( FIELD => 'Filename', OPERATOR => 'IS', VALUE => 'NULL');
- }
+ $attachments->Limit ( FIELD => 'Filename', OPERATOR => 'IS', VALUE => 'NULL')
+ if RT->Config->Get('SuppressInlineTextFiles');
}
return ($attachments);
</%INIT>
More information about the Rt-commit
mailing list