[Rt-commit] rt branch, 3.9-merge-rtfm, updated. rt-3.9.6-1090-gafa3a5d
Kevin Falcone
falcone at bestpractical.com
Fri Dec 3 18:09:31 EST 2010
The branch, 3.9-merge-rtfm has been updated
via afa3a5d473e26dbc47dc479a99b4f5f80519cedb (commit)
via 47fbc3a5f37f5d348555e0b0bc29b427f5406711 (commit)
via 082d5595cd3a5fdc05de8043382322870631668d (commit)
from 03b94e1ea6ace03fde5b0f534e716e6b43410dee (commit)
Summary of changes:
etc/RT_Config.pm.in | 8 ++++++++
lib/RT/URI/fsck_com_article.pm | 2 +-
share/html/Article/Delete.html | 2 +-
share/html/Article/Elements/ShowSearchCriteria | 6 +++---
share/html/Article/Search.html | 10 +++++-----
share/html/Articles/Elements/BeforeMessageBox | 2 +-
share/html/Articles/Elements/GotoArticle | 2 +-
share/html/Articles/Elements/IncludeArticle | 2 +-
share/html/Articles/Elements/NewestArticles | 4 ++--
share/html/Articles/Elements/QuickSearch | 2 +-
share/html/Articles/Elements/UpdatedArticles | 4 ++--
share/html/Elements/Tabs | 24 ++++++++++++------------
share/html/Search/Article.html | 2 +-
share/html/Search/Elements/Article | 4 ++--
14 files changed, 41 insertions(+), 33 deletions(-)
- Log -----------------------------------------------------------------
commit 082d5595cd3a5fdc05de8043382322870631668d
Author: Kevin Falcone <falcone at bestpractical.com>
Date: Fri Dec 3 17:46:29 2010 -0500
I misnamed this config setting, restore the correct one
diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index dc663c6..9cb46b9 100755
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -2326,6 +2326,14 @@ This will only work with 3.8.1 or greater
Set($ArticleOnTicketCreate, 0);
+=item C<$HideArticleSearchOnReplyCreate>
+
+=back
+
+=cut
+
+Set($HideArticleSearchOnReplyCreate, 0);
+
=head1 DON'T MESS WITH THE STUFF BELOW
=cut
diff --git a/share/html/Articles/Elements/BeforeMessageBox b/share/html/Articles/Elements/BeforeMessageBox
index ef04b67..213ad9d 100644
--- a/share/html/Articles/Elements/BeforeMessageBox
+++ b/share/html/Articles/Elements/BeforeMessageBox
@@ -49,7 +49,7 @@
% }
<table class="articles-select-article">
-% unless (RT->Config->Get('ArticleOnTicketCreate')) {
+% unless (RT->Config->Get('HideArticleSearchOnReplyCreate')) {
<tr>
<td><&|/l&>Search for Articles matching</&></td>
<td><input size=20 name="<% $name_prefix %>Articles_Content" /></td>
commit 47fbc3a5f37f5d348555e0b0bc29b427f5406711
Author: Kevin Falcone <falcone at bestpractical.com>
Date: Fri Dec 3 18:01:42 2010 -0500
Revert "update code for /Articles/Article => /Article"
This reverts commits
c5e50503fdc4adbc23bb81d9baa1f78bbbd442c4
3ca031b4d6d35a7a42a68a29430cacbd5e62e49b.
It also fixes the Article menu in Elements/Tabs
to use a proper url structure
Conflicts:
share/html/Elements/Tabs
diff --git a/lib/RT/URI/fsck_com_article.pm b/lib/RT/URI/fsck_com_article.pm
index 7c9af2e..ef52367 100644
--- a/lib/RT/URI/fsck_com_article.pm
+++ b/lib/RT/URI/fsck_com_article.pm
@@ -186,7 +186,7 @@ Otherwise, return its URI
sub HREF {
my $self = shift;
if ($self->IsLocal && $self->Object) {
- return ( $RT::WebURL . "/Articles/Display.html?id=".$self->Object->Id);
+ return ( $RT::WebURL . "/Articles/Article/Display.html?id=".$self->Object->Id);
}
else {
return ($self->URI);
diff --git a/share/html/Article/Delete.html b/share/html/Article/Delete.html
index 479afc1..0f6c97e 100644
--- a/share/html/Article/Delete.html
+++ b/share/html/Article/Delete.html
@@ -45,7 +45,7 @@
%# those contributions and any derivatives thereof.
%#%# END BPS TAGGED BLOCK }}}
% if ($ARGS{'Delete'}) {
-<& /Article/Elements/Tabs, Title => $title &>
+<& /Articles/Article/Elements/Tabs, Title => $title &>
<%$title%>
<& /Elements/ListActions, actions => \@results &>
diff --git a/share/html/Article/Elements/ShowSearchCriteria b/share/html/Article/Elements/ShowSearchCriteria
index bc50da4..33e0bdd 100644
--- a/share/html/Article/Elements/ShowSearchCriteria
+++ b/share/html/Article/Elements/ShowSearchCriteria
@@ -78,12 +78,12 @@
<td class="value"><&|/l&>matches</&>
% my $matches = $field->Name."~";
% my $nomatches = $field->Name."!~";
-<& /Article/Elements/SearchByCustomField,
+<& /Articles/Article/Elements/SearchByCustomField,
Field => $field,
Name => $matches,
Values => $ARGS{$matches} &>
<&|/l&>and not</&>
-<& /Article/Elements/SearchByCustomField,
+<& /Articles/Article/Elements/SearchByCustomField,
Field => $field,
Name => $nomatches,
Values => $ARGS{$nomatches}
@@ -133,7 +133,7 @@
<tr>
<td class="label"></td>
<td>
-<& /Article/Elements/EditTopics, %ARGS, Classes => \@Classes, OnlyThisClass => 1 &>
+<& /Articles/Article/Elements/EditTopics, %ARGS, Classes => \@Classes, OnlyThisClass => 1 &>
<br />
<input type="checkbox" name="ExpandTopics" <% $ARGS{'ExpandTopics'} ? 'checked="checked"' : "" %> />
<&|/l&>Include subtopics</&>
diff --git a/share/html/Article/Search.html b/share/html/Article/Search.html
index 124b69f..6447523 100644
--- a/share/html/Article/Search.html
+++ b/share/html/Article/Search.html
@@ -55,7 +55,7 @@
<td valign="top" width="50%">
<ul>
% while (my $class = $Classes->Next) {
-<li><a href="<%RT->Config->Get('WebPath')%>/Article/Search.html?<% $m->comp('/Elements/QueryString', %filtered, Class => $class->id) %>"><&|/l, $class->Name&>in class [_1]</&></a></li>
+<li><a href="<%RT->Config->Get('WebPath')%>/Articles/Article/Search.html?<% $m->comp('/Elements/QueryString', %filtered, Class => $class->id) %>"><&|/l, $class->Name&>in class [_1]</&></a></li>
% }
</ul>
</td>
@@ -101,15 +101,15 @@
</form>
<div align=right>
-<a href="<%RT->Config->Get('WebPath')%>/Article/Search.html<%$QueryString%>"><&|/l&>Bookmarkable link for this search</&></a><br />
+<a href="<%RT->Config->Get('WebPath')%>/Articles/Article/Search.html<%$QueryString%>"><&|/l&>Bookmarkable link for this search</&></a><br />
</div>
<%init>
use RT::SavedSearch;
my @results;
my $articles = RT::Articles->new( $session{'CurrentUser'} );
my $format = q{
- '<a href="/Article/Display.html?id=__id__">__id__</a>/TITLE:#',
- '<a href="/Article/Display.html?id=__id__">__Name__</a>/TITLE:Name',
+ '<a href="/Articles/Article/Display.html?id=__id__">__id__</a>/TITLE:#',
+ '<a href="/Articles/Article/Display.html?id=__id__">__Name__</a>/TITLE:Name',
'__ClassName__',
'__CreatedRelative__',
'__LastUpdatedRelative__',
@@ -121,7 +121,7 @@ my $format = q{
# If it is a number, load the article with that ID. Otherwise, search
# on name and summary.
if ($ARGS{'q'} && $ARGS{'q'} =~ /^(\d+)$/) {
- return $m->comp("/Article/Display.html", id => $1);
+ return $m->comp("/Articles/Article/Display.html", id => $1);
}
# }}}
diff --git a/share/html/Articles/Elements/GotoArticle b/share/html/Articles/Elements/GotoArticle
index d274776..d84a2a5 100644
--- a/share/html/Articles/Elements/GotoArticle
+++ b/share/html/Articles/Elements/GotoArticle
@@ -44,7 +44,7 @@
%# works based on those contributions, and sublicense and distribute
%# those contributions and any derivatives thereof.
%#%# END BPS TAGGED BLOCK }}}
-<form ACTION="<% RT->Config->Get('WebPath') %>/Article/Search.html">
+<form ACTION="<% RT->Config->Get('WebPath') %>/Articles/Article/Search.html">
<input type="hidden" name="HideOptions" value="1" />
<input size="12" name="q" accesskey="0" />
% if ($class or $topic) {
diff --git a/share/html/Articles/Elements/IncludeArticle b/share/html/Articles/Elements/IncludeArticle
index 2515d4b..55e1557 100644
--- a/share/html/Articles/Elements/IncludeArticle
+++ b/share/html/Articles/Elements/IncludeArticle
@@ -79,7 +79,7 @@ foreach my $arg ( keys %$parent_args ) {
);
next unless $article && $article->id;
- my $formatted_article = $m->scomp('/Article/Elements/Preformatted',
+ my $formatted_article = $m->scomp('/Articles/Article/Elements/Preformatted',
Article => $article, Ticket => $Ticket
);
diff --git a/share/html/Articles/Elements/NewestArticles b/share/html/Articles/Elements/NewestArticles
index 0916ce1..e946332 100644
--- a/share/html/Articles/Elements/NewestArticles
+++ b/share/html/Articles/Elements/NewestArticles
@@ -56,9 +56,9 @@
% $i++;
<tr class="<% $i%2 ? 'oddline' : 'evenline'%>">
<td align="right"><%$Article->Id%></td>
-<td><a href="<% RT->Config->Get('WebPath') %>/Article/Display.html?id=<%$Article->Id%>"><%$Article->Name || loc('(no name)')%></a></td>
+<td><a href="<% RT->Config->Get('WebPath') %>/Articles/Article/Display.html?id=<%$Article->Id%>"><%$Article->Name || loc('(no name)')%></a></td>
<td><%$Article->CreatorObj->Name%></td>
-<td align="right">[<a href="<% RT->Config->Get('WebPath') %>/Article/Edit.html?id=<%$Article->Id%>"><&|/l&>Update</&></a>]</td>
+<td align="right">[<a href="<% RT->Config->Get('WebPath') %>/Articles/Article/Edit.html?id=<%$Article->Id%>"><&|/l&>Update</&></a>]</td>
</tr>
<tr class="<% $i%2 ? 'oddline' : 'evenline'%>">
<td> </td>
diff --git a/share/html/Articles/Elements/QuickSearch b/share/html/Articles/Elements/QuickSearch
index 76cae77..b78c210 100644
--- a/share/html/Articles/Elements/QuickSearch
+++ b/share/html/Articles/Elements/QuickSearch
@@ -47,7 +47,7 @@
<& /Elements/TitleBoxStart, title => loc('Quick search') &>
<ul>
% while (my $class = $classes->Next) {
-<li><a href="<%RT->Config->Get('WebPath')%>/Article/Search.html?Class=<%$class->Name%>&Parent=0&HideOptions=1"><%$class->Name%></a></li>
+<li><a href="<%RT->Config->Get('WebPath')%>/Articles/Article/Search.html?Class=<%$class->Name%>&Parent=0&HideOptions=1"><%$class->Name%></a></li>
% }
</ul>
<& /Elements/TitleBoxEnd &>
diff --git a/share/html/Articles/Elements/UpdatedArticles b/share/html/Articles/Elements/UpdatedArticles
index c7af41a..560f0f5 100644
--- a/share/html/Articles/Elements/UpdatedArticles
+++ b/share/html/Articles/Elements/UpdatedArticles
@@ -57,9 +57,9 @@
% $i++;
<tr class="<% $i%2 ? 'oddline' : 'evenline'%>">
<td align="right"><%$Article->Id%></td>
-<td><a href="<% RT->Config->Get('WebPath') %>/Article/Display.html?id=<%$Article->Id%>"><%$Article->Name || loc('(no name)')%></a></td>
+<td><a href="<% RT->Config->Get('WebPath') %>/Articles/Article/Display.html?id=<%$Article->Id%>"><%$Article->Name || loc('(no name)')%></a></td>
<td><%$Article->CreatorObj->Name%></td>
-<td align="right">[<a href="<% RT->Config->Get('WebPath') %>/Article/Edit.html?id=<%$Article->Id%>"><&|/l&>Update</&></a>]</td>
+<td align="right">[<a href="<% RT->Config->Get('WebPath') %>/Articles/Article/Edit.html?id=<%$Article->Id%>"><&|/l&>Update</&></a>]</td>
</tr>
<tr class="<% $i%2 ? 'oddline' : 'evenline'%>">
<td> </td>
diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index 7834c21..a72d9b1 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -95,7 +95,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
}
my $articles = $tools->child( articles => title => loc('Articles') => path => "/Articles/index.html", sort_order => 10 );
- $articles->child( search => title => loc('Search') => path => "/Article/Search.html" );
+ $articles->child( search => title => loc('Search') => path => "/Articles/Article/Search.html" );
$articles->child( articles => title => loc('Articles') => path => "/Articles/index.html" );
$articles->child( topics => title => loc('Topics') => path => "/Articles/Topics.html" );
@@ -600,30 +600,30 @@ if ( $request_path !~ qr{^/SelfService/} ) {
my $id = $m->request_args->{'id'};
my $tabs = PageMenu();
- $tabs->child( display => title => loc('Display') => path => "/Article/Display.html?id=".$id, );
- $tabs->child( history => title => loc('History') => path => "/Article/History.html?id=".$id, );
- $tabs->child( modify => title => loc('Modify') => path => "/Article/Edit.html?id=".$id, );
- $tabs->child( delete => title => loc('Delete') => path => "/Article/Delete.html?id=".$id, );
+ $tabs->child( display => title => loc('Display') => path => "/Articles/Article/Display.html?id=".$id, );
+ $tabs->child( history => title => loc('History') => path => "/Articles/Article/History.html?id=".$id, );
+ $tabs->child( modify => title => loc('Modify') => path => "/Articles/Article/Edit.html?id=".$id, );
+ $tabs->child( delete => title => loc('Delete') => path => "/Articles/Article/Delete.html?id=".$id, );
}
}
if ( $request_path =~ qr{^/Articles/} ) {
my $tabs = PageMenu();
- $tabs->child( search => path => "/Article/Search.html", title => loc("Search") );
- $tabs->child( create => path => "/Article/PreCreate.html", title => loc("New Article" ) );
+ $tabs->child( search => path => "/Articles/Article/Search.html", title => loc("Search") );
+ $tabs->child( create => path => "Articles/Article/PreCreate.html", title => loc("New Article" ) );
if ( ( $m->request_args->{'id'} || '' ) =~ /^(\d+)$/ ) {
my $id = $1;
my $obj = RT::Article->new( $session{'CurrentUser'} );
$obj->Load($id);
- $tabs->child( display => title => "Display", path => "/Article/Display.html?id=" . $id );
- $tabs->child( history => title => loc('History'), path => '/Article/History.html?id=' . $id );
+ $tabs->child( display => title => "Display", path => "/Articles/Article/Display.html?id=" . $id );
+ $tabs->child( history => title => loc('History'), path => '/Articles/Article/History.html?id=' . $id );
if ( $obj->CurrentUserHasRight('ModifyArticle') ) {
- $tabs->child(modify => title => loc('Modify'), path => '/Article/Edit.html?id=' . $id );
+ $tabs->child(modify => title => loc('Modify'), path => '/Articles/Article/Edit.html?id=' . $id );
}
if ( $obj->CurrentUserHasRight('DeleteArticle') ) {
- $tabs->child(delete => title => loc('Delete'), path => '/Article/Delete.html?id=' . $id );
+ $tabs->child(delete => title => loc('Delete'), path => '/Articles/Article/Delete.html?id=' . $id );
}
}
diff --git a/share/html/Search/Article.html b/share/html/Search/Article.html
index 59e835b..bf52510 100644
--- a/share/html/Search/Article.html
+++ b/share/html/Search/Article.html
@@ -48,6 +48,6 @@
<%init>
RT::Interface::Web::Redirect(RT->Config->Get('WebURL').
- 'Article/Search.html?' . $m->comp( '/Elements/QueryString',
+ 'Articles/Article/Search.html?' . $m->comp( '/Elements/QueryString',
%ARGS, Load => 'Load', CurrentSearch => $ARGS{LoadSavedSearch} ) );
</%init>
diff --git a/share/html/Search/Elements/Article b/share/html/Search/Elements/Article
index 152ac7e..2837155 100644
--- a/share/html/Search/Elements/Article
+++ b/share/html/Search/Elements/Article
@@ -49,8 +49,8 @@
Collection => $articles,
Class => 'RT::Articles',
Format => q{
- '<a href="/Article/Display.html?id=__id__">__id__</a>/TITLE:#',
- '<a href="/Article/Display.html?id=__id__">__Name__</a>/TITLE:Name',
+ '<a href="/Articles/Article/Display.html?id=__id__">__id__</a>/TITLE:#',
+ '<a href="/Articles/Article/Display.html?id=__id__">__Name__</a>/TITLE:Name',
'__ClassName__',
'__CreatedRelative__',
'__LastUpdatedRelative__',
commit afa3a5d473e26dbc47dc479a99b4f5f80519cedb
Author: Kevin Falcone <falcone at bestpractical.com>
Date: Fri Dec 3 18:09:14 2010 -0500
Undo damage from reverting the incorrect Articles rename
diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index a72d9b1..6e39517 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -482,7 +482,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
# TODO needs a "Can extract article into a class applied to this queue" check
$actions->child( 'extract-article' => title => loc('Extract Article') =>
- path => "/Article/ExtractIntoClass.html?Ticket=".$obj->id );
+ path => "/Articles/Article/ExtractIntoClass.html?Ticket=".$obj->id );
if ( defined $session{"tickets"} ) {
# we have to update session data if we get new ItemMap
@@ -610,7 +610,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
if ( $request_path =~ qr{^/Articles/} ) {
my $tabs = PageMenu();
$tabs->child( search => path => "/Articles/Article/Search.html", title => loc("Search") );
- $tabs->child( create => path => "Articles/Article/PreCreate.html", title => loc("New Article" ) );
+ $tabs->child( create => path => "/Articles/Article/PreCreate.html", title => loc("New Article" ) );
if ( ( $m->request_args->{'id'} || '' ) =~ /^(\d+)$/ ) {
my $id = $1;
my $obj = RT::Article->new( $session{'CurrentUser'} );
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list