From 9c68254528b6f2c7d8c1921b452fa56064783782 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 2 Mar 2008 04:06:06 +0000 Subject: import rt 3.4.6 --- rt/html/Admin/Groups/CustomFields.html | 6 +-- rt/html/Admin/Groups/GroupRights.html | 48 ++++++++++----------- rt/html/Admin/Groups/History.html | 8 ++-- rt/html/Admin/Groups/Members.html | 78 ++++++++++++++-------------------- rt/html/Admin/Groups/Modify.html | 48 ++++++++++----------- rt/html/Admin/Groups/UserRights.html | 32 +++++++------- rt/html/Admin/Groups/index.html | 38 ++++++++--------- 7 files changed, 117 insertions(+), 141 deletions(-) (limited to 'rt/html/Admin/Groups') diff --git a/rt/html/Admin/Groups/CustomFields.html b/rt/html/Admin/Groups/CustomFields.html index 8ffa54aab..c2336b042 100644 --- a/rt/html/Admin/Groups/CustomFields.html +++ b/rt/html/Admin/Groups/CustomFields.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,9 +22,7 @@ %# %# 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/copyleft/gpl.html. +%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. %# %# %# CONTRIBUTION SUBMISSION POLICY: diff --git a/rt/html/Admin/Groups/GroupRights.html b/rt/html/Admin/Groups/GroupRights.html index b81b6a938..d95bdae07 100644 --- a/rt/html/Admin/Groups/GroupRights.html +++ b/rt/html/Admin/Groups/GroupRights.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,9 +22,7 @@ %# %# 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/copyleft/gpl.html. +%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -52,50 +50,50 @@ Title => loc('Modify group rights for group [_1]', $GroupObj->Name) &> <& /Elements/ListActions, actions => \@results &> -
- + + -<&| /Widgets/TitleBox, title => loc('Modify group rights for group [_1]', $GroupObj->Name) &> +<& /Elements/TitleBoxStart, title => loc('Modify group rights for group [_1]', $GroupObj->Name) &>

<&|/l&>System groups

- +
% $Groups = RT::Groups->new($session{'CurrentUser'}); % $Groups->LimitToSystemInternalGroups(); % while (my $Group = $Groups->Next()) { - - + - + - + + % } -
+
<% loc($Group->Type) %> - + <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId, PrincipalType => 'Group', Object => $GroupObj &> -
+

<&|/l&>User defined groups

- +
% $Groups = RT::Groups->new($session{'CurrentUser'}); % $Groups->LimitToUserDefinedGroups(); % while (my $Group = $Groups->Next()) { - - + - + - + + % } -
+
<% $Group->Name %> - + <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId, PrincipalType => 'Group', Object => $GroupObj &> -
+ - + <& /Elements/TitleBoxEnd &> <& /Elements/Submit, Label => loc('Modify Group Rights'), Reset => 1 &> -
+ <%INIT> diff --git a/rt/html/Admin/Groups/History.html b/rt/html/Admin/Groups/History.html index ee1d5539c..40dab46e9 100644 --- a/rt/html/Admin/Groups/History.html +++ b/rt/html/Admin/Groups/History.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,9 +22,7 @@ %# %# 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/copyleft/gpl.html. +%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -54,7 +52,7 @@ <& /Ticket/Elements/ShowHistory, Ticket => $GroupObj, - ShowDisplayModes => 0, + ShowHeaderModes => 0, &> <%INIT> diff --git a/rt/html/Admin/Groups/Members.html b/rt/html/Admin/Groups/Members.html index 5d189a122..fd25b2d7f 100644 --- a/rt/html/Admin/Groups/Members.html +++ b/rt/html/Admin/Groups/Members.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,9 +22,7 @@ %# %# 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/copyleft/gpl.html. +%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -52,37 +50,36 @@ <& /Elements/ListActions, actions => \@results &> -<&| /Widgets/TitleBox, title => loc('Editing membership for group [_1]', $Group->Name) &> +<& /Elements/TitleBoxStart, title => loc('Editing membership for group [_1]', $Group->Name) &> -
- - - - + + +
+ + + + + - + - + + - - + - - -

<&|/l&>Current members

-		 +

<&|/l&>Add members

-
+
% if ($Group->MembersObj->Count == 0 ) { -<&|/l&>(No members) +<&|/l&>(No members) % } else { -<&|/l&>(Check box to delete) -
-
+<&|/l&>(Check box to delete) +
+
<&|/l&>Users -% my $Users = $Group->UserMembersObj; -% $Users->OrderBy( FIELD => $UserOrderBy, ORDER => $UserOrder ); -
    -% while (my $user = $Users->Next()) { -% $UsersSeen{$user->id} = 1 if $SkipSeenUsers; -
  • -<%$user->Name%> (<%$user->RealName%>) +% my $UserMembers = $Group->MembersObj; +% $UserMembers->LimitToUsers(); +
      +% while (my $member = $UserMembers->Next()) { +
    • +<%$member->MemberObj->Object->Name%> (<%$member->MemberObj->Object->RealName%>) % }
    <&|/l&>Groups @@ -90,20 +87,18 @@ % my $GroupMembers = $Group->MembersObj; % $GroupMembers->LimitToGroups(); % while (my $member = $GroupMembers->Next()) { -% $GroupsSeen{$member->MemberId} = 1 if $SkipSeenGroups; -
  • +
  • <%$member->MemberObj->Object->Name%> % } % } -
-		 -<& /Admin/Elements/SelectNewGroupMembers, Name => "AddMembers", Group => $Group, - SkipUsers => \%UsersSeen, SkipGroups => \%GroupsSeen &> -
- + +		 +<& /Admin/Elements/SelectNewGroupMembers, Name => "AddMembers", Group => $Group &> +
+<& /Elements/TitleBoxEnd &> <& /Elements/Submit, Label => loc('Modify Members'), Reset => 1 &>
@@ -151,9 +146,6 @@ foreach my $member (@AddMembers) { push (@results, $msg); } -my %UsersSeen; -my %GroupsSeen; -$GroupsSeen{$Group->id} = 1; # can't be a member of ourself @@ -161,8 +153,4 @@ $GroupsSeen{$Group->id} = 1; # can't be a member of ourself $AddMembersUsers => undef $AddMembersGroups => undef $id => undef -$UserOrderBy => 'Name' -$UserOrder => 'ASC' -$SkipSeenUsers => 1 -$SkipSeenGroups => 1 diff --git a/rt/html/Admin/Groups/Modify.html b/rt/html/Admin/Groups/Modify.html index 1e3b03958..94c0203b1 100644 --- a/rt/html/Admin/Groups/Modify.html +++ b/rt/html/Admin/Groups/Modify.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,9 +22,7 @@ %# %# 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/copyleft/gpl.html. +%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -55,38 +53,38 @@ -
+ %unless ($Group->Id) { - + % } else { - + % } - -
+ + - - - - - + + + + + + % my $CFs = $Group->CustomFields; % while (my $CF = $CFs->Next) { - + % } - - + + <& /Elements/Callback, GroupObj => $Group, results => \@results, %ARGS &> -
<&|/l&>Name: -
-<&|/l&>Description:
+<&|/l&>Description:
+
<% $CF->Name %>: - + <& /Elements/EditCustomField, CustomField => $CF, Object => $Group &> -
- - /> <&|/l&>Enabled (Unchecking this box disables this group)
-
+ +> <&|/l&>Enabled (Unchecking this box disables this group)
+
+
<& /Elements/Submit, Label => loc('Save Changes'), Reset => 1 &>
<%INIT> diff --git a/rt/html/Admin/Groups/UserRights.html b/rt/html/Admin/Groups/UserRights.html index b77edb011..5237b1578 100644 --- a/rt/html/Admin/Groups/UserRights.html +++ b/rt/html/Admin/Groups/UserRights.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,9 +22,7 @@ %# %# 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/copyleft/gpl.html. +%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -52,32 +50,32 @@ Title => loc('Modify user rights for group [_1]', $GroupObj->Name) &> <& /Elements/ListActions, actions => \@results &> -
- + + -<&| /Widgets/TitleBox, title => loc('Modify user rights for group [_1]', $GroupObj->Name) &> +<& /Elements/TitleBoxStart, title => loc('Modify user rights for group [_1]', $GroupObj->Name) &> - +
% while (my $Member = $Users->Next()) { % my $UserObj = $Member->MemberObj->Object(); - - + - + - + + % } -
+
<% $UserObj->Name %> - + <& /Admin/Elements/SelectRights, PrincipalId => $Member->MemberObj->Id, PrincipalType => 'User', Object => $GroupObj &> -
+ - + <& /Elements/TitleBoxEnd &> <& /Elements/Submit, Label => loc('Modify User Rights'), Reset => 1 &> -
+ <%INIT> diff --git a/rt/html/Admin/Groups/index.html b/rt/html/Admin/Groups/index.html index 384092bdf..50857e5f4 100644 --- a/rt/html/Admin/Groups/index.html +++ b/rt/html/Admin/Groups/index.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,9 +22,7 @@ %# %# 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/copyleft/gpl.html. +%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -49,31 +47,31 @@ <& /Admin/Elements/GroupTabs, current_tab => 'Admin/Groups/', current_subtab => 'Admin/Groups/', Title => $title &> -<%$caption%>:
%if (my $ids = join(',', @ids)) { -(<&|/l&>Download as a tab-delimited file)
+(<&|/l&>Download as a tab-delimited file)
%} -

-
- <&|/l&>Include disabled groups in listing. -
-
-
+

+
+ <&|/l&>Include disabled groups in listing. +
+
+
-

-
-<&|/l&>Find groups whose <& /Elements/SelectGroups &>
-
-
+

+
+<&|/l&>Find groups whose <& /Elements/SelectGroups &>
+
+
<%INIT> my $Groups = RT::Groups->new($session{'CurrentUser'}); $Groups->LimitToUserDefinedGroups(); -- cgit v1.2.1