diff options
Diffstat (limited to 'rt/share/html/SelfService')
-rw-r--r-- | rt/share/html/SelfService/Article/Display.html | 73 | ||||
-rw-r--r-- | rt/share/html/SelfService/Article/Search.html | 114 | ||||
-rw-r--r--[-rwxr-xr-x] | rt/share/html/SelfService/Article/autohandler (renamed from rt/share/html/SelfService/Elements/Tabs) | 67 | ||||
-rwxr-xr-x | rt/share/html/SelfService/Attachment/dhandler | 2 | ||||
-rwxr-xr-x | rt/share/html/SelfService/Closed.html | 4 | ||||
-rwxr-xr-x | rt/share/html/SelfService/Create.html | 6 | ||||
-rwxr-xr-x | rt/share/html/SelfService/CreateTicketInQueue.html | 2 | ||||
-rwxr-xr-x | rt/share/html/SelfService/Display.html | 18 | ||||
-rwxr-xr-x | rt/share/html/SelfService/Elements/GotoTicket | 6 | ||||
-rwxr-xr-x | rt/share/html/SelfService/Elements/Header | 6 | ||||
-rwxr-xr-x | rt/share/html/SelfService/Elements/MyRequests | 24 | ||||
-rw-r--r-- | rt/share/html/SelfService/Elements/SearchArticle | 51 | ||||
-rwxr-xr-x | rt/share/html/SelfService/Error.html | 2 | ||||
-rwxr-xr-x | rt/share/html/SelfService/Prefs.html | 2 | ||||
-rwxr-xr-x | rt/share/html/SelfService/Update.html | 31 | ||||
-rwxr-xr-x | rt/share/html/SelfService/index.html | 4 |
16 files changed, 281 insertions, 131 deletions
diff --git a/rt/share/html/SelfService/Article/Display.html b/rt/share/html/SelfService/Article/Display.html new file mode 100644 index 000000000..77b3c0ff2 --- /dev/null +++ b/rt/share/html/SelfService/Article/Display.html @@ -0,0 +1,73 @@ +%# BEGIN BPS TAGGED BLOCK {{{ +%# +%# COPYRIGHT: +%# +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC +%# <sales@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/licenses/old-licenses/gpl-2.0.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 }}} +<& /SelfService/Elements/Header, Title => loc('Display Article [_1]', $id) &> +<span class="label"><%$article->Name || loc("(no name)")%></span><br /> +<em><span class="value"><%$article->Summary%></span></em> +<& /Elements/ShowCustomFields, Object => $article &> + +<%init> + +my $article = RT::Article->new( $session{'CurrentUser'} ); +if ($id) { + $article->Load($id); +} +unless ( $article->Id ) { + $m->comp( "/Elements/Error", Why => loc("Article not found") ); +} + +unless ( $article->CurrentUserHasRight('ShowArticle') ) { + $m->comp( "/Elements/Error", Why => loc("Permission Denied") ); +} +my $title = loc( "Article #[_1]: [_2]", $article->Id, $article->Name || loc("(no name)")); + +$id = $article->id; + +</%init> +<%args> +$id => undef +</%args> diff --git a/rt/share/html/SelfService/Article/Search.html b/rt/share/html/SelfService/Article/Search.html new file mode 100644 index 000000000..c9acc555a --- /dev/null +++ b/rt/share/html/SelfService/Article/Search.html @@ -0,0 +1,114 @@ +%# BEGIN BPS TAGGED BLOCK {{{ +%# +%# COPYRIGHT: +%# +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC +%# <sales@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/licenses/old-licenses/gpl-2.0.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 }}} +<& /SelfService/Elements/Header, Title => loc('Search Articles') &> + +<table> +<form action="<%RT->Config->Get('WebPath')%>/SelfService/Article/Search.html"> +<tr> +<td><&|/l&>Search for Articles matching</&></td> +<td><input size=20 name="Articles_Content" /></td> +<td><input type="submit" value="Search"></td> +</tr> +</form> + +<tr> +<td> </td> +<td> +% if ($Articles_Content) { +% if ($articles_basics->Count || $articles_content->Count) { +<&|/l,$Articles_Content&>Articles matching [_1]</&> +% } else { +<&|/l,$Articles_Content&>No Articles match [_1]</&> +% } +% } +</td> +</tr> + +% my %dedupe_articles; +% while (my $article = $articles_content->Next) { +% $dedupe_articles{$article->Id}++; +<tr> +<td> </td> +<td><a href="Display.html?id=<%$article->Id%>"><%$article->Name || loc('(no name)')%>: <%$article->Summary%><a></td> +</tr> +% } + +% while (my $article = $articles_basics->Next) { +% next if $dedupe_articles{$article->Id}; +<tr> +<td> </td> +<td><a href="Display.html?id=<%$article->Id%>"><%$article->Name || loc('(no name)')%>: <%$article->Summary%><a></td> +</tr> +% } +</table> +<%init> +use RT::Articles; + +my $articles_content = RT::Articles->new( $session{'CurrentUser'} ); +my $articles_basics = RT::Articles->new( $session{'CurrentUser'} ); +if ( $ARGS{'Articles_Content'} ) { + $articles_content->LimitCustomField( VALUE => $ARGS{'Articles_Content'}, + OPERATOR => 'LIKE' ); + + $articles_basics->Limit( SUBCLAUSE => 'all', + FIELD => 'Name', + OPERATOR => 'LIKE', + VALUE => $ARGS{'Articles_Content'}, + ENTRYAGGREGATOR => "OR" ); + $articles_basics->Limit( SUBCLAUSE => 'all', + FIELD => 'Summary', + OPERATOR => 'LIKE', + VALUE => $ARGS{'Articles_Content'}, + ENTRYAGGREGATOR => "OR" ); +} + + +</%init> +<%args> +$Articles_Content => '' +</%args> diff --git a/rt/share/html/SelfService/Elements/Tabs b/rt/share/html/SelfService/Article/autohandler index eb4cba80c..802184c27 100755..100644 --- a/rt/share/html/SelfService/Elements/Tabs +++ b/rt/share/html/SelfService/Article/autohandler @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -45,69 +45,14 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -% $m->callback( %ARGS, tabs => $tabs, actions => $actions ); -<& /Elements/PageLayout, - current_toptab => $current_toptab, - current_tab => $current_tab, - toptabs => $tabs, - topactions => $actions, - title => $Title -&> -<a name="skipnav" id="skipnav" accesskey="8"></a> <%INIT> -my $queues = RT::Queues->new($session{'CurrentUser'}); -$queues->UnLimit; - -my $queue_count = 0; -my $queue_id = 1; - -while (my $queue = $queues->Next) { - next unless $queue->CurrentUserHasRight('CreateTicket'); - $queue_id = $queue->id; - $queue_count++; - last if ($queue_count > 1); -} - -if ($Title) { -$Title = loc("RT Self Service") . " / " . $Title; -} else { -$Title = loc("RT Self Service"); +if ( $session{'CurrentUser'}->HasRight( Right => 'ShowArticle', + Object => $RT::System )) { + $m->comp( { base_comp => $m->request_comp }, $m->fetch_next, %ARGS); } -my ($tab); -my $tabs = { A => { title => loc('Open tickets'), - path => 'SelfService/', - }, - B => { title => loc('Closed tickets'), - path => 'SelfService/Closed.html', - }, - }; - -if ($queue_count > 1) { - $tabs->{C} = { title => loc('New ticket'), - path => 'SelfService/CreateTicketInQueue.html' - }; -} else { - $tabs->{C} = { title => loc('New ticket'), - path => 'SelfService/Create.html?Queue=' . $queue_id - }; -} - -if ($session{'CurrentUser'}->HasRight( Right => 'ModifySelf', - Object => $RT::System )) { - $tabs->{Z} = { title => loc('Preferences'), - path => 'SelfService/Prefs.html' - }; +else { + RT::Interface::Web::Redirect($RT::WebURL."SelfService/"); } -my $actions = { - B => { html => $m->scomp('GotoTicket') - } - }; </%INIT> -<%ARGS> -$Title => undef -$current_toptab => undef -$current_tab => undef -</%ARGS> - diff --git a/rt/share/html/SelfService/Attachment/dhandler b/rt/share/html/SelfService/Attachment/dhandler index ebe44f9ed..e3381a981 100755 --- a/rt/share/html/SelfService/Attachment/dhandler +++ b/rt/share/html/SelfService/Attachment/dhandler @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) diff --git a/rt/share/html/SelfService/Closed.html b/rt/share/html/SelfService/Closed.html index 268a2264e..6fd6e8328 100755 --- a/rt/share/html/SelfService/Closed.html +++ b/rt/share/html/SelfService/Closed.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -49,7 +49,7 @@ <& /SelfService/Elements/MyRequests, %ARGS, - status => ['rejected', 'resolved'], + status => [ RT::Queue->InactiveStatusArray ], friendly_status => loc('closed'), BaseURL => RT->Config->Get('WebPath') ."/SelfService/Closed.html?", Page => $Page, diff --git a/rt/share/html/SelfService/Create.html b/rt/share/html/SelfService/Create.html index 56ef79fc3..e28ab0f57 100755 --- a/rt/share/html/SelfService/Create.html +++ b/rt/share/html/SelfService/Create.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -51,14 +51,14 @@ <form action="Create.html" method="post" enctype="multipart/form-data"> <input type="hidden" class="hidden" name="id" value="new" /> -<table> +<table width="100%"> <tr> <td class="label"> <&|/l&>Queue</&>: </td> <td class="value"> <input type="hidden" class="hidden" name="Queue" value="<%$queue_obj->id || ''%>" /> - <strong><%$queue_obj->Name || ''%></strong> (<%$queue_obj->Description || ''%>) + <strong><%$queue_obj->Name || ''%></strong> <% $queue_obj->Description ? '('.$queue_obj->Description.')' : '' %> </td> </tr> <% $m->callback( CallbackName => 'AfterQueue', %ARGS, QueueObj => $queue_obj ) %> diff --git a/rt/share/html/SelfService/CreateTicketInQueue.html b/rt/share/html/SelfService/CreateTicketInQueue.html index 4707e831c..887c32e35 100755 --- a/rt/share/html/SelfService/CreateTicketInQueue.html +++ b/rt/share/html/SelfService/CreateTicketInQueue.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) diff --git a/rt/share/html/SelfService/Display.html b/rt/share/html/SelfService/Display.html index 4f227b18a..23c74672a 100755 --- a/rt/share/html/SelfService/Display.html +++ b/rt/share/html/SelfService/Display.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -74,7 +74,6 @@ -%#!!pape: selfservice_find_attachments.patch {{ <& /Ticket/Elements/ShowHistory, Ticket => $Ticket, URIFile => "Display.html", @@ -84,7 +83,6 @@ Attachments => $attachments, UpdatePath => "Update.html" &> -%#!!pape: selfservice_find_attachments.patch }} @@ -94,16 +92,16 @@ my ( $field, @results ); $m->callback( ARGSRef => \%ARGS, CallbackName => 'Initial' ); -# {{{ Load the ticket +# Load the ticket #If we get handed two ids, mason will make them an array. bleck. # We want teh first one. Just because there's no other sensible way # to deal my @id = ( ref $id eq 'ARRAY' ) ? @{$id} : ($id); -my $Ticket = new RT::Ticket( $session{'CurrentUser'} ); +my $Ticket = RT::Ticket->new( $session{'CurrentUser'} ); # store the uploaded attachment in session -if ( $ARGS{'Attach'} ) { # attachment? +if ( defined $ARGS{'Attach'} && length $ARGS{'Attach'} ) { # attachment? $session{'Attachments'} = {} unless defined $session{'Attachments'}; my $attachment = MakeMIMEEntity( @@ -121,7 +119,7 @@ if ( defined ($id[0]) && $id[0] eq 'new' ) { # {{{ Create a new ticket - my $Queue = new RT::Queue( $session{'CurrentUser'} ); + my $Queue = RT::Queue->new( $session{'CurrentUser'} ); unless ( $Queue->Load( $ARGS{'Queue'} ) ) { $m->comp( 'Error.html', Why => loc('Queue not found') ); $m->abort; @@ -136,21 +134,19 @@ if ( defined ($id[0]) && $id[0] eq 'new' ) { ( $Ticket, @results ) = - CreateTicket( Attachments => $session{'Attachments'}, %ARGS, Status => 'new' ); + CreateTicket( Attachments => $session{'Attachments'}, %ARGS ); unless ( $Ticket->id ) { $m->comp( 'Error.html', Why => join( "\n", @results )); $m->abort(); } - # }}} # delete temporary storage entry to make WebUI clean unless ( keys %{ $session{'Attachments'} } and $ARGS{'UpdateAttach'} ) { delete $session{'Attachments'}; } - # }}} } else { unless ( $Ticket->Load( $id[0] ) ) { @@ -186,7 +182,6 @@ if ( defined ($id[0]) && $id[0] eq 'new' ) { my @cfupdates = ProcessObjectCustomFieldUpdates(Object => $Ticket, ARGSRef => \%ARGS); push (@results, @cfupdates); - # }}} #Update the status if ( ( defined $ARGS{'Status'} ) @@ -196,7 +191,6 @@ if ( defined ($id[0]) && $id[0] eq 'new' ) { ( $code, $msg ) = $Ticket->SetStatus( $ARGS{'Status'} ); push @results, "$msg"; } - # }}} } diff --git a/rt/share/html/SelfService/Elements/GotoTicket b/rt/share/html/SelfService/Elements/GotoTicket index 45fc4d9a9..28bc81b82 100755 --- a/rt/share/html/SelfService/Elements/GotoTicket +++ b/rt/share/html/SelfService/Elements/GotoTicket @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -45,6 +45,6 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -<form action="<% RT->Config->Get('WebPath') %>/SelfService/Display.html" method="get" id="GotoTicket"> -<input type="submit" class="button" value="<&|/l&>Goto ticket</&>" /> <input size="4" name="id" /> +<form action="<% RT->Config->Get('WebPath') %>/SelfService/Display.html" method="get" id="GotoTicket" name="GotoTicket"> +<input size="4" name="id" value="<&|/l&>Goto Ticket</&>..." onfocus="if (this.value=='<&|/l&>Goto Ticket</&>...') this.value=''" /> </form> diff --git a/rt/share/html/SelfService/Elements/Header b/rt/share/html/SelfService/Elements/Header index dc59ecb5e..7cbc0ad96 100755 --- a/rt/share/html/SelfService/Elements/Header +++ b/rt/share/html/SelfService/Elements/Header @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -45,5 +45,5 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -<& /Elements/Header, %ARGS, Prefs => '/SelfService/Prefs.html' &> -<& /SelfService/Elements/Tabs, %ARGS &> +<& /Elements/Header, %ARGS &> +<& /Elements/Tabs &> diff --git a/rt/share/html/SelfService/Elements/MyRequests b/rt/share/html/SelfService/Elements/MyRequests index 8bca07607..76accfc9b 100755 --- a/rt/share/html/SelfService/Elements/MyRequests +++ b/rt/share/html/SelfService/Elements/MyRequests @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -45,42 +45,34 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -<&| /Widgets/TitleBox, title => $title &> +<&| /Widgets/TitleBox, title => $title &> <& /Elements/CollectionList, Title => $title, Format => $Format, Query => $Query, Order => @Order, OrderBy => @OrderBy, BaseURL => $BaseURL, - GenericQueryArgs => $GenericQueryArgs, - AllowSorting => $AllowSorting, + AllowSorting => 1, Class => 'RT::Tickets', Rows => $Rows, Page => $Page &> </&> <%INIT> +my $title = loc("My [_1] tickets", $friendly_status); my $id = $session{'CurrentUser'}->id; -my $Query = "( " - . join( ' OR ', map "$_.id = $id", @roles ) - . ")"; +my $Query = "( Watcher.id = $id )"; if ( @status ) { - $Query .= " AND ( " - . join( ' OR ', map "Status = '$_'", @status ) - . " )"; + @status = map {s/(['\\])/\\$1/g; "Status = '$_'"} @status; + $Query .= " AND ( " . join(' OR ', @status ) . " )"; } my $Format = RT->Config->Get('DefaultSelfServiceSearchResultFormat'); - </%INIT> <%ARGS> $friendly_status => loc('open') -$title => loc("My [_1] tickets", $friendly_status) -@roles => ('Watcher') -@status => RT::Queue->ActiveStatusArray() +@status => () $BaseURL => undef $Page => 1 -$GenericQueryArgs => undef -$AllowSorting => 1 @Order => ('ASC') @OrderBy => ('Created') $Rows => 50 diff --git a/rt/share/html/SelfService/Elements/SearchArticle b/rt/share/html/SelfService/Elements/SearchArticle new file mode 100644 index 000000000..d547127b5 --- /dev/null +++ b/rt/share/html/SelfService/Elements/SearchArticle @@ -0,0 +1,51 @@ +%# BEGIN BPS TAGGED BLOCK {{{ +%# +%# COPYRIGHT: +%# +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC +%# <sales@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/licenses/old-licenses/gpl-2.0.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 }}} +<form action="<% RT->Config->Get('WebPath') %>/SelfService/Article/Search.html" id="ArticleSearch"> +<input size="4" name="Articles_Content" value="<&|/l&>Search Articles</&>..." onfocus="if (this.value=='<&|/l&>Search Articles</&>...') this.value=''" /> +</form> + diff --git a/rt/share/html/SelfService/Error.html b/rt/share/html/SelfService/Error.html index 74b6acf1a..9f0c7f82e 100755 --- a/rt/share/html/SelfService/Error.html +++ b/rt/share/html/SelfService/Error.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) diff --git a/rt/share/html/SelfService/Prefs.html b/rt/share/html/SelfService/Prefs.html index 6f3bc9336..ac5d725ad 100755 --- a/rt/share/html/SelfService/Prefs.html +++ b/rt/share/html/SelfService/Prefs.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) diff --git a/rt/share/html/SelfService/Update.html b/rt/share/html/SelfService/Update.html index 61ce09059..6525d3de9 100755 --- a/rt/share/html/SelfService/Update.html +++ b/rt/share/html/SelfService/Update.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -54,13 +54,13 @@ <form action="Display.html" method="post" enctype="multipart/form-data"> <input type="hidden" class="hidden" name="UpdateType" value="response" /> <input type="hidden" class="hidden" name="id" value="<%$Ticket->Id%>" /> -<table> +<table width="100%"> <tr> <td class="label"> <&|/l&>Status</&> </td> <td class="value"> - <& /Elements/SelectStatus, Name=>"Status", DefaultLabel => loc("[_1] (Unchanged)", loc($Ticket->Status)), Default => $ARGS{'Status'} || ($Ticket->Status eq $DefaultStatus ? undef : $DefaultStatus)&> + <& /Elements/SelectStatus, Name => "Status", TicketObj => $Ticket, DefaultLabel => loc("[_1] (Unchanged)", loc($Ticket->Status)), Default => $ARGS{'Status'} || ($Ticket->Status eq $DefaultStatus ? undef : $DefaultStatus)&> </td> </tr> <tr> @@ -72,30 +72,9 @@ </td> </tr> -% if (exists $session{'Attachments'}) { -<tr> - <td class="label"> - <&|/l&>Attached file</&> - </td> - <td colspan="5" class="value"> - <&|/l&>Check box to delete</&><br /> -% foreach my $attach_name (keys %{$session{'Attachments'}}) { - <input type="checkbox" class="checkbox" name="DeleteAttach-<%$attach_name%>" value="1" /><%$attach_name%><br /> -% } # end of foreach - </td> -</tr> -% } # end of if -<tr> - <td class="label"> - <&|/l&>Attach</&> - </td> - <td class="value"> - <input name="Attach" type="file" /> - <input type="hidden" class="hidden" name="UpdateAttach" value="1" /> - </td> - </tr> + <& /Ticket/Elements/AddAttachments, %ARGS, TicketObj => $Ticket &> + <tr><td colspan="2"><& /Ticket/Elements/EditCustomFields, TicketObj => $Ticket &></td></tr> </table> -<& /Ticket/Elements/EditCustomFields, TicketObj => $Ticket &> <& /Elements/MessageBox, Name => "UpdateContent", QuoteTransaction => $ARGS{QuoteTransaction} diff --git a/rt/share/html/SelfService/index.html b/rt/share/html/SelfService/index.html index f57554aab..29accf551 100755 --- a/rt/share/html/SelfService/index.html +++ b/rt/share/html/SelfService/index.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -48,6 +48,8 @@ <& /SelfService/Elements/Header, Title => loc('Open tickets') &> <& /SelfService/Elements/MyRequests, %ARGS, + status => [ RT::Queue->ActiveStatusArray() ], + friendly_status => loc('open'), BaseURL => RT->Config->Get('WebPath') ."/SelfService/?", Page => $Page, &> |