From 1c538bfabc2cd31f27067505f0c3d1a46cba6ef0 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Thu, 9 Jul 2015 22:18:55 -0700 Subject: RT 4.2.11, ticket#13852 --- rt/share/html/User/Elements/Portlets/ActiveTickets | 70 +++++++++++++ rt/share/html/User/Elements/Portlets/CreateTicket | 58 +++++++++++ rt/share/html/User/Elements/Portlets/ExtraInfo | 56 ++++++++++ .../html/User/Elements/Portlets/InactiveTickets | 70 +++++++++++++ rt/share/html/User/Elements/TicketList | 115 +++++++++++++++++++++ rt/share/html/User/Elements/UserInfo | 64 ++++++++++++ rt/share/html/User/History.html | 67 ++++++++++++ rt/share/html/User/Prefs.html | 27 +++-- rt/share/html/User/Search.html | 101 ++++++++++++++++++ rt/share/html/User/Summary.html | 99 ++++++++++++++++++ 10 files changed, 713 insertions(+), 14 deletions(-) create mode 100644 rt/share/html/User/Elements/Portlets/ActiveTickets create mode 100644 rt/share/html/User/Elements/Portlets/CreateTicket create mode 100644 rt/share/html/User/Elements/Portlets/ExtraInfo create mode 100644 rt/share/html/User/Elements/Portlets/InactiveTickets create mode 100644 rt/share/html/User/Elements/TicketList create mode 100644 rt/share/html/User/Elements/UserInfo create mode 100644 rt/share/html/User/History.html create mode 100644 rt/share/html/User/Search.html create mode 100644 rt/share/html/User/Summary.html (limited to 'rt/share/html/User') diff --git a/rt/share/html/User/Elements/Portlets/ActiveTickets b/rt/share/html/User/Elements/Portlets/ActiveTickets new file mode 100644 index 000000000..f281d3269 --- /dev/null +++ b/rt/share/html/User/Elements/Portlets/ActiveTickets @@ -0,0 +1,70 @@ +%# BEGIN BPS TAGGED BLOCK {{{ +%# +%# COPYRIGHT: +%# +%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC +%# +%# +%# (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 }}} +<& /User/Elements/TicketList , + User => $User, + conditions => $conditions, + Rows => $Rows, + WatcherTypes => [qw(Watcher)], + Class => "user active-tickets", + Title => loc('Active Tickets'), + TitleBox => 1, + ShowHeader => 1, + Format => RT->Config->Get('UserSummaryTicketListFormat'), +&> +<%INIT> +unless ( @$conditions ) { + foreach (RT::Queue->ActiveStatusArray()) { + push @$conditions, { cond => "Status = '$_'", name => loc($_) }; + } +} + +<%ARGS> +$User => undef +$conditions => [] +$Rows => 10 + diff --git a/rt/share/html/User/Elements/Portlets/CreateTicket b/rt/share/html/User/Elements/Portlets/CreateTicket new file mode 100644 index 000000000..b4df5a39c --- /dev/null +++ b/rt/share/html/User/Elements/Portlets/CreateTicket @@ -0,0 +1,58 @@ +%# BEGIN BPS TAGGED BLOCK {{{ +%# +%# COPYRIGHT: +%# +%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC +%# +%# +%# (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 }}} +<&| /Widgets/TitleBox, title => loc('Quick ticket creation'), class => "user create-ticket" &> +
+<&|/l&>Create a ticket with this user as the Requestor in Queue + +<& /Elements/SelectNewTicketQueue &> + +
+ +<%ARGS> +$User + diff --git a/rt/share/html/User/Elements/Portlets/ExtraInfo b/rt/share/html/User/Elements/Portlets/ExtraInfo new file mode 100644 index 000000000..70007cdac --- /dev/null +++ b/rt/share/html/User/Elements/Portlets/ExtraInfo @@ -0,0 +1,56 @@ +%# BEGIN BPS TAGGED BLOCK {{{ +%# +%# COPYRIGHT: +%# +%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC +%# +%# +%# (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 }}} +<&| /Widgets/TitleBox, title => loc('User Information'), class => "user extra-info" &> + +% $m->callback( User => $User, CallbackName => 'BeforeExtraInfo' ); +<& /User/Elements/UserInfo, User => $User, FormatConfig => 'UserSummaryExtraInfo', ClassPrefix => 'user-summary' &> + + +<%ARGS> +$User + diff --git a/rt/share/html/User/Elements/Portlets/InactiveTickets b/rt/share/html/User/Elements/Portlets/InactiveTickets new file mode 100644 index 000000000..52cced117 --- /dev/null +++ b/rt/share/html/User/Elements/Portlets/InactiveTickets @@ -0,0 +1,70 @@ +%# BEGIN BPS TAGGED BLOCK {{{ +%# +%# COPYRIGHT: +%# +%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC +%# +%# +%# (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 }}} +<& /User/Elements/TicketList , + User => $User, + conditions => $conditions, + Rows => $Rows, + WatcherTypes => [qw(Watcher)], + Class => "user inactive-tickets", + Title => loc('Inactive Tickets'), + TitleBox => 1, + ShowHeader => 1, + Format => RT->Config->Get('UserSummaryTicketListFormat'), +&> +<%INIT> +unless ( @$conditions ) { + foreach (RT::Queue->InactiveStatusArray()) { + push @$conditions, { cond => "Status = '$_'", name => loc($_) }; + } +} + +<%ARGS> +$User => undef +$conditions => [] +$Rows => 10 + diff --git a/rt/share/html/User/Elements/TicketList b/rt/share/html/User/Elements/TicketList new file mode 100644 index 000000000..6d17afe4c --- /dev/null +++ b/rt/share/html/User/Elements/TicketList @@ -0,0 +1,115 @@ +%# BEGIN BPS TAGGED BLOCK {{{ +%# +%# COPYRIGHT: +%# +%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC +%# +%# +%# (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 }}} +% if ( $TitleBox ) { + <& /Widgets/TitleBoxStart, title => $Title, title_href => $url, class => $Class &> +% } else { + <% $Title %>: +% } + +<& /Elements/CollectionList, + %QueryProperties, + + Class => 'RT::Tickets', + Page => 1, + AllowSorting => 0, + ShowNavigation => 0, +&> + +% if ( $TitleBox ) { + <& /Widgets/TitleBoxEnd &> +% } +<%INIT> + +my $sql = ''; + +$sql = join(' OR ', map { "$_.id = ".$User->Id } @WatcherTypes ); +$sql = "( $sql )"; + +$m->callback( CallbackName => 'ModifyWatcherSQL', + %ARGS, + sql => \$sql, +); + +if (@$conditions) { + $sql .= " AND (".join( " OR ", map $_->{cond}, @$conditions).")"; +} + +my %QueryProperties = ( + Query => $sql, + OrderBy => 'Priority|id', + Order => 'DESC|DESC', + Rows => $Rows || 10, + ShowHeader => $ShowHeader, + Format => $Format, +); + +$m->callback( CallbackName => 'ModifyQueryProperties', + %ARGS, + QueryProperties => \%QueryProperties, +); + +my $url = RT->Config->Get('WebPath') . '/Search/Results.html?'; + $url .= $m->comp('/Elements/QueryString', + Query => $QueryProperties{'Query'}, + OrderBy => $QueryProperties{'OrderBy'}, + Order => $QueryProperties{'Order'}, + ); + + +<%ARGS> +$Title => '' +$Class => '' +@WatcherTypes => (qw(Watcher)) +$User => undef +$conditions +$Rows => 10 +$Description => '' +$TitleBox => 0 +$Format => '' +$ShowHeader => 0 + diff --git a/rt/share/html/User/Elements/UserInfo b/rt/share/html/User/Elements/UserInfo new file mode 100644 index 000000000..6944483d0 --- /dev/null +++ b/rt/share/html/User/Elements/UserInfo @@ -0,0 +1,64 @@ +%# BEGIN BPS TAGGED BLOCK {{{ +%# +%# COPYRIGHT: +%# +%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC +%# +%# +%# (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 }}} +<& /Elements/ShowRecord, + Object => $User, + Format => $format, + TrustFormat => 1, # Only modifiable by the RT server admin, so no need to scrub. + Class => "$ClassPrefix-extra", + &> +<%INIT> +return unless blessed($User) and $User->id; +return unless $FormatConfig; +my $format = RT->Config->Get($FormatConfig); +return unless $format; + +<%ARGS> +$User => undef +$FormatConfig => undef +$ClassPrefix => undef + diff --git a/rt/share/html/User/History.html b/rt/share/html/User/History.html new file mode 100644 index 000000000..a5ad3d238 --- /dev/null +++ b/rt/share/html/User/History.html @@ -0,0 +1,67 @@ +%# BEGIN BPS TAGGED BLOCK {{{ +%# +%# COPYRIGHT: +%# +%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC +%# +%# +%# (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 }}} +<& /Elements/Header, Title => loc('History of the user [_1]', $User->Format) &> +<& /Elements/Tabs &> + +<& /Elements/ShowHistory, + Object => $User, + ShowDisplayModes => 0, + DisplayPath => 'History.html', +&> + +<%INIT> +my $User = RT::User->new( $session{'CurrentUser'} ); +my ($status, $msg) = $User->Load($id); +unless ($status) { + RT->Logger->error("Unable to load user $id: $msg"); + Abort("Unable to load User $id"); +} + +<%ARGS> +$id => undef + diff --git a/rt/share/html/User/Prefs.html b/rt/share/html/User/Prefs.html index d491145e0..be2919a65 100755 --- a/rt/share/html/User/Prefs.html +++ b/rt/share/html/User/Prefs.html @@ -80,6 +80,7 @@ <&|/l&>Timezone: <& /Elements/SelectTimezone, Name => 'Timezone', Default => $UserObj->Timezone &> +<& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Identity', InTable => 1 &> <&| /Widgets/TitleBox, title => loc('Phone numbers'), id => "user-prefs-phone" &> @@ -100,11 +101,12 @@ <&|/l&>Pager: +<& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Phones', InTable => 1 &> %if ($UserObj->Privileged) { -<&| /Widgets/TitleBox, title => loc('Signature') &> +<&| /Widgets/TitleBox, title => loc('Signature'), id => "user-prefs-signature" &> @@ -119,6 +121,9 @@ User => $UserObj, Name => [qw(CurrentPass Pass1 Pass2)], &> + +<& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Access control' &> + <&| /Widgets/TitleBox, title => loc('Location'), id => "user-prefs-location" &> @@ -151,27 +156,21 @@ <&|/l&>Country: +<& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Location', InTable => 1 &> -<&| /Widgets/TitleBox, title => loc('Custom Fields') &> - -% my $CustomFields = $UserObj->CustomFields; -% while ( my $CF = $CustomFields->Next ) { - - - -% } -
<% loc( $CF->Name ) %>:<& /Elements/EditCustomField, - %ARGS, Object => $UserObj, CustomField => $CF -&>
- + + +<& /Elements/EditCustomFieldCustomGroupings, Object => $UserObj &> + + <& /Elements/Submit, Label => loc('Save Preferences') &> <&| /Widgets/TitleBox, title => loc('Secret authentication token'), id => "user-prefs-feeds" &> -<&|/l&>All iCal feeds embed a secret token which authorizes you. If the URL one of your iCal feeds got exposed to the outside world, you can get a new secret, breaking all existing iCal feeds below. +<&|/l&>All iCal feeds embed a secret token which authorizes you. If the URL for one of your iCal feeds was exposed to the outside world, you can get a new secret, breaking all existing iCal feeds, below.