diff options
Diffstat (limited to 'rt/html/Admin/Global')
-rw-r--r-- | rt/html/Admin/Global/CustomFields/Groups.html | 4 | ||||
-rwxr-xr-x | rt/html/Admin/Global/CustomFields/Queue-Tickets.html | 4 | ||||
-rwxr-xr-x | rt/html/Admin/Global/CustomFields/Queue-Transactions.html | 4 | ||||
-rw-r--r-- | rt/html/Admin/Global/CustomFields/Users.html | 4 | ||||
-rw-r--r-- | rt/html/Admin/Global/CustomFields/index.html | 4 | ||||
-rw-r--r-- | rt/html/Admin/Global/GroupRights.html | 4 | ||||
-rw-r--r-- | rt/html/Admin/Global/MyRT.html | 15 | ||||
-rw-r--r-- | rt/html/Admin/Global/Scrip.html | 6 | ||||
-rw-r--r-- | rt/html/Admin/Global/Scrips.html | 4 | ||||
-rw-r--r-- | rt/html/Admin/Global/Template.html | 23 | ||||
-rw-r--r-- | rt/html/Admin/Global/Templates.html | 4 | ||||
-rw-r--r-- | rt/html/Admin/Global/UserRights.html | 14 | ||||
-rw-r--r-- | rt/html/Admin/Global/index.html | 4 |
13 files changed, 50 insertions, 44 deletions
diff --git a/rt/html/Admin/Global/CustomFields/Groups.html b/rt/html/Admin/Global/CustomFields/Groups.html index 62bd31cb2..fe2545a6f 100644 --- a/rt/html/Admin/Global/CustomFields/Groups.html +++ b/rt/html/Admin/Global/CustomFields/Groups.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -24,7 +24,7 @@ %# 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/copyleft/gpl.html. +%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: diff --git a/rt/html/Admin/Global/CustomFields/Queue-Tickets.html b/rt/html/Admin/Global/CustomFields/Queue-Tickets.html index 3feb4242f..8ef308315 100755 --- a/rt/html/Admin/Global/CustomFields/Queue-Tickets.html +++ b/rt/html/Admin/Global/CustomFields/Queue-Tickets.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -24,7 +24,7 @@ %# 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/copyleft/gpl.html. +%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: diff --git a/rt/html/Admin/Global/CustomFields/Queue-Transactions.html b/rt/html/Admin/Global/CustomFields/Queue-Transactions.html index 5f58a1833..98aee5f89 100755 --- a/rt/html/Admin/Global/CustomFields/Queue-Transactions.html +++ b/rt/html/Admin/Global/CustomFields/Queue-Transactions.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -24,7 +24,7 @@ %# 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/copyleft/gpl.html. +%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: diff --git a/rt/html/Admin/Global/CustomFields/Users.html b/rt/html/Admin/Global/CustomFields/Users.html index 6f965b755..11133a504 100644 --- a/rt/html/Admin/Global/CustomFields/Users.html +++ b/rt/html/Admin/Global/CustomFields/Users.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -24,7 +24,7 @@ %# 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/copyleft/gpl.html. +%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: diff --git a/rt/html/Admin/Global/CustomFields/index.html b/rt/html/Admin/Global/CustomFields/index.html index b5c9fe8f3..3ef08f869 100644 --- a/rt/html/Admin/Global/CustomFields/index.html +++ b/rt/html/Admin/Global/CustomFields/index.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -24,7 +24,7 @@ %# 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/copyleft/gpl.html. +%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: diff --git a/rt/html/Admin/Global/GroupRights.html b/rt/html/Admin/Global/GroupRights.html index 7c863d53a..3101eae75 100644 --- a/rt/html/Admin/Global/GroupRights.html +++ b/rt/html/Admin/Global/GroupRights.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -24,7 +24,7 @@ %# 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/copyleft/gpl.html. +%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: diff --git a/rt/html/Admin/Global/MyRT.html b/rt/html/Admin/Global/MyRT.html index 8bbcb5d34..52793f4dd 100644 --- a/rt/html/Admin/Global/MyRT.html +++ b/rt/html/Admin/Global/MyRT.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -24,7 +24,7 @@ %# 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/copyleft/gpl.html. +%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -83,6 +83,8 @@ for ( $m->comp( "/Search/Elements/SearchesForObject", my ($default_portlets) = $sys->Attributes->Named('HomepageSettings'); +my $has_right = $session{'CurrentUser'}->HasRight( Object=> $RT::System, Right => 'SuperUser'); + my @panes = $m->comp( '/Admin/Elements/ConfigureMyRT', panes => ['body', 'summary'], @@ -91,8 +93,13 @@ my @panes = $m->comp( current_portlets => $default_portlets->Content, OnSave => sub { my ( $conf, $pane ) = @_; - $default_portlets->SetContent( $conf ); - push @actions, loc( 'Global portlet [_1] saved.', $pane ); + if (!$has_right) { + push @actions, loc( 'Permission denied' ); + } + else { + $default_portlets->SetContent( $conf ); + push @actions, loc( 'Global portlet [_1] saved.', $pane ); + } } ); diff --git a/rt/html/Admin/Global/Scrip.html b/rt/html/Admin/Global/Scrip.html index fc72ca969..d4af7d5bd 100644 --- a/rt/html/Admin/Global/Scrip.html +++ b/rt/html/Admin/Global/Scrip.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -24,7 +24,7 @@ %# 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/copyleft/gpl.html. +%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -74,7 +74,7 @@ my ($id, @results) = $m->comp( '/Admin/Elements/EditScrip:Process', %ARGS ); my ($title, $current_subtab); if ( $id ) { $current_subtab = "Admin/Global/Scrip.html?id=$id&Queue=0"; - $title = loc("Modify a scrip which applies to all queues"); + $title = loc("Modify a scrip that applies to all queues"); $subtabs->{"C"} = { title => loc('Scrip #[_1]', $id), path => "Admin/Global/Scrip.html?id=$id&Queue=0", diff --git a/rt/html/Admin/Global/Scrips.html b/rt/html/Admin/Global/Scrips.html index a5fe26757..479d39bc5 100644 --- a/rt/html/Admin/Global/Scrips.html +++ b/rt/html/Admin/Global/Scrips.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -24,7 +24,7 @@ %# 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/copyleft/gpl.html. +%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: diff --git a/rt/html/Admin/Global/Template.html b/rt/html/Admin/Global/Template.html index 9d5a40916..b44a912cb 100644 --- a/rt/html/Admin/Global/Template.html +++ b/rt/html/Admin/Global/Template.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -24,7 +24,7 @@ %# 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/copyleft/gpl.html. +%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -45,15 +45,14 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -<& /Admin/Elements/Header, Title => loc("Modify template [_1]", $TemplateObj->id) &> +<& /Admin/Elements/Header, Title => $title &> <& /Admin/Elements/SystemTabs, current_tab => 'Admin/Global/Templates.html', current_subtab => $current_subtab, subtabs => $subtabs, - Title => loc("Modify template [_1]", $TemplateObj->id) &> + Title => $title &> <& /Elements/ListActions, actions => \@results &> - <form method="post" action="Template.html"> %if ($Create ) { <input type="hidden" class="hidden" name="Template" value="new" /> @@ -63,14 +62,12 @@ %# hang onto the queue id <input type="hidden" class="hidden" name="Queue" value="<%$Queue%>" /> - -<& /Admin/Elements/ModifyTemplate, Name => $TemplateObj->Name, Description => $TemplateObj->Description, Content => $TemplateObj->Content &> - -<& /Elements/Submit, Label => loc('Save Changes'), Reset => 1 &> +<& /Admin/Elements/ModifyTemplate, Name => $TemplateObj->Name, Description => +$TemplateObj->Description, Content => $TemplateObj->Content &> +<& /Elements/Submit, Label => loc('Create'), Reset => 1 &> </form> - <%INIT> my $TemplateObj = new RT::Template($session{'CurrentUser'}); @@ -86,10 +83,9 @@ my $subtabs = { } }; - if ($Create) { - $current_subtab = "Admin/Global/Template.html?Create=1&Queue=0"; $title = loc("Create a template"); + $current_subtab = "Admin/Global/Template.html?Create=1&Queue=0"; } else { @@ -101,7 +97,7 @@ else { else { $TemplateObj->Load($Template) || Abort(loc('No Template')); } - $title = loc('Modify template [_1]', loc($TemplateObj->Name())); + $title = loc('Modify template [_1]', loc($TemplateObj->Name())); } @@ -116,6 +112,7 @@ if ($TemplateObj->Id()) { }; push @results, @aresults; } + </%INIT> <%ARGS> $Queue => undef diff --git a/rt/html/Admin/Global/Templates.html b/rt/html/Admin/Global/Templates.html index afd290d3c..e953c0283 100644 --- a/rt/html/Admin/Global/Templates.html +++ b/rt/html/Admin/Global/Templates.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -24,7 +24,7 @@ %# 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/copyleft/gpl.html. +%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: diff --git a/rt/html/Admin/Global/UserRights.html b/rt/html/Admin/Global/UserRights.html index 9276b1a19..6691e14d5 100644 --- a/rt/html/Admin/Global/UserRights.html +++ b/rt/html/Admin/Global/UserRights.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -24,7 +24,7 @@ %# 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/copyleft/gpl.html. +%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -57,10 +57,9 @@ <table> -% while (my $Member = $Users->Next()) { -% my $UserObj = $Member->MemberObj->Object(); +% while (my $UserObj = $Users->Next()) { % my $group = RT::Group->new($session{'CurrentUser'}); -% $group->LoadACLEquivalenceGroup($Member->MemberObj); +% $group->LoadACLEquivalenceGroup($UserObj); <tr align="right"> <td valign="top"> <% $UserObj->Name %> @@ -89,7 +88,8 @@ # Find out which users we want to display ACL selects for my $Privileged = RT::Group->new($session{'CurrentUser'}); $Privileged->LoadSystemInternalGroup('Privileged'); -my $Users = $Privileged->MembersObj(); +my $Users = $Privileged->UserMembersObj(); +$Users->OrderBy( FIELD => $UserOrderBy, ORDER => $UserOrder ); @@ -98,4 +98,6 @@ my $Users = $Privileged->MembersObj(); </%INIT> <%ARGS> +$UserOrderBy => 'Name' +$UserOrder => 'ASC' </%ARGS> diff --git a/rt/html/Admin/Global/index.html b/rt/html/Admin/Global/index.html index 77e9caa9c..e84fc7f80 100644 --- a/rt/html/Admin/Global/index.html +++ b/rt/html/Admin/Global/index.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -24,7 +24,7 @@ %# 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/copyleft/gpl.html. +%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: |