From 8103c1fc1b2c27a6855feadf26f91b980a54bc52 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 2 Mar 2008 04:11:51 +0000 Subject: import rt 3.6.6 --- rt/html/Admin/CustomFields/GroupRights.html | 44 +-- rt/html/Admin/CustomFields/Modify.html | 82 ++++-- rt/html/Admin/CustomFields/Objects.html | 14 +- rt/html/Admin/CustomFields/UserRights.html | 28 +- rt/html/Admin/CustomFields/index.html | 35 ++- rt/html/Admin/Elements/AddCustomFieldValue | 44 +-- rt/html/Admin/Elements/CreateUserCalled | 10 +- rt/html/Admin/Elements/CustomFieldTabs | 6 +- rt/html/Admin/Elements/EditCustomField | 56 ++-- rt/html/Admin/Elements/EditCustomFieldValues | 24 +- rt/html/Admin/Elements/EditCustomFields | 34 ++- rt/html/Admin/Elements/EditQueueWatchers | 12 +- rt/html/Admin/Elements/EditScrip | 242 ++++++++-------- rt/html/Admin/Elements/EditScrips | 34 ++- rt/html/Admin/Elements/EditTemplates | 50 ++-- rt/html/Admin/Elements/EditUserComments | 14 +- rt/html/Admin/Elements/GlobalCustomFieldTabs | 6 +- rt/html/Admin/Elements/GroupTabs | 6 +- rt/html/Admin/Elements/Header | 6 +- rt/html/Admin/Elements/ListGlobalCustomFields | 8 +- rt/html/Admin/Elements/ListGlobalScrips | 19 +- rt/html/Admin/Elements/ModifyTemplate | 56 ++-- rt/html/Admin/Elements/ObjectCustomFields | 6 +- rt/html/Admin/Elements/PickCustomFields | 40 +-- rt/html/Admin/Elements/PickObjects | 39 +-- rt/html/Admin/Elements/QueueRightsForUser | 12 +- rt/html/Admin/Elements/QueueTabs | 6 +- rt/html/Admin/Elements/SelectCustomFieldLookupType | 12 +- rt/html/Admin/Elements/SelectCustomFieldType | 12 +- rt/html/Admin/Elements/SelectGroups | 12 +- rt/html/Admin/Elements/SelectModifyGroup | 8 +- rt/html/Admin/Elements/SelectModifyQueue | 8 +- rt/html/Admin/Elements/SelectModifyUser | 8 +- rt/html/Admin/Elements/SelectNewGroupMembers | 24 +- rt/html/Admin/Elements/SelectRights | 40 +-- rt/html/Admin/Elements/SelectScrip | 18 +- rt/html/Admin/Elements/SelectScripAction | 19 +- rt/html/Admin/Elements/SelectScripCondition | 20 +- rt/html/Admin/Elements/SelectSingleOrMultiple | 6 +- rt/html/Admin/Elements/SelectStage | 12 +- rt/html/Admin/Elements/SelectTemplate | 24 +- rt/html/Admin/Elements/SelectUsers | 12 +- rt/html/Admin/Elements/SystemTabs | 11 +- rt/html/Admin/Elements/Tabs | 6 +- rt/html/Admin/Elements/ToolTabs | 6 +- rt/html/Admin/Elements/UserTabs | 9 +- rt/html/Admin/Global/CustomFields/Groups.html | 47 ++++ .../Admin/Global/CustomFields/Queue-Tickets.html | 47 ++++ .../Global/CustomFields/Queue-Transactions.html | 47 ++++ rt/html/Admin/Global/CustomFields/Users.html | 47 ++++ rt/html/Admin/Global/CustomFields/index.html | 8 +- rt/html/Admin/Global/GroupRights.html | 62 +++-- rt/html/Admin/Global/Scrip.html | 45 +-- rt/html/Admin/Global/Scrips.html | 6 +- rt/html/Admin/Global/Template.html | 16 +- rt/html/Admin/Global/Templates.html | 6 +- rt/html/Admin/Global/UserRights.html | 30 +- rt/html/Admin/Global/index.html | 16 +- 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 | 54 ++-- rt/html/Admin/Groups/UserRights.html | 32 ++- rt/html/Admin/Groups/index.html | 38 +-- rt/html/Admin/Queues/CustomField.html | 6 +- rt/html/Admin/Queues/CustomFields.html | 6 +- rt/html/Admin/Queues/GroupRights.html | 60 ++-- rt/html/Admin/Queues/Modify.html | 96 +++---- rt/html/Admin/Queues/People.html | 50 ++-- rt/html/Admin/Queues/Scrip.html | 67 +++-- rt/html/Admin/Queues/Scrips.html | 8 +- rt/html/Admin/Queues/Template.html | 16 +- rt/html/Admin/Queues/Templates.html | 6 +- rt/html/Admin/Queues/UserRights.html | 28 +- rt/html/Admin/Queues/index.html | 24 +- rt/html/Admin/Tools/Configuration.html | 10 +- rt/html/Admin/Tools/index.html | 6 +- rt/html/Admin/Users/CustomFields.html | 6 +- rt/html/Admin/Users/History.html | 8 +- rt/html/Admin/Users/Memberships.html | 6 +- rt/html/Admin/Users/Modify.html | 306 +++++++++++---------- rt/html/Admin/Users/index.html | 28 +- rt/html/Admin/autohandler | 6 +- rt/html/Admin/index.html | 12 +- 85 files changed, 1539 insertions(+), 1057 deletions(-) (limited to 'rt/html/Admin') diff --git a/rt/html/Admin/CustomFields/GroupRights.html b/rt/html/Admin/CustomFields/GroupRights.html index 380fee479..a416327c5 100644 --- a/rt/html/Admin/CustomFields/GroupRights.html +++ b/rt/html/Admin/CustomFields/GroupRights.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -51,46 +53,46 @@ &> <& /Elements/ListActions, actions => \@results &> -
- + +

<&|/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, Object => $CustomFieldObj &> -
+

<&|/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, Object => $CustomFieldObj &> -
+ <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &> -
+ <%INIT> diff --git a/rt/html/Admin/CustomFields/Modify.html b/rt/html/Admin/CustomFields/Modify.html index 4c3c92114..0202f0ad6 100644 --- a/rt/html/Admin/CustomFields/Modify.html +++ b/rt/html/Admin/CustomFields/Modify.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -51,15 +53,15 @@ <& /Elements/ListActions, actions => \@results &> -
- + + - + - + @@ -77,23 +79,64 @@ + + + + + + + + + + + + + + + + +
<&|/l&>Name
<&|/l&>Description
<&|/l&>Validation +<& /Widgets/ComboBox, + Name => 'Pattern', + Default => $CustomFieldObj->Pattern, + Size => 20, + Values => [ + '(?#Mandatory).', + '(?#Digits)^[\d.]+$', + '(?#Year)^[12]\d{3}$', + ], +&> +
  - -> <&|/l&>Enabled (Unchecking this box disables this custom field) + + /> <&|/l&>Enabled (Unchecking this box disables this custom field) +
<&|/l&>Link values to +
+<&|/l&>RT can make this custom field's values into hyperlinks to another service. +<&|/l&>Fill in this field with a URL. +<&|/l&>RT will replace __id__ and __CustomField__ with the record id and custom field value, respectively +
<&|/l&>Include page +
+<&|/l&>RT can include content from another web service when showing this custom field. +<&|/l&>Fill in this field with a URL. +<&|/l&>RT will replace __id__ and __CustomField__ with the record id and custom field value, respectively +<&|/l&>Some browsers may only load content from the same domain as your RT server. +
+
-
-% if ($CustomFieldObj->Id && $CustomFieldObj->Type =~ /^Select/i) { -

<&|/l&>Values

+
+% if ($CustomFieldObj->Id && $CustomFieldObj->IsSelectionType) { +

<&|/l&>Values

<& /Admin/Elements/EditCustomFieldValues, CustomField => $CustomFieldObj &> <& /Admin/Elements/AddCustomFieldValue, CustomField => $CustomFieldObj &>
% } <&/Elements/Submit&> -
+ @@ -115,7 +158,8 @@ else { my ( $val, $msg ) = $CustomFieldObj->Create(Name => $Name, TypeComposite => $TypeComposite, LookupType => $LookupType, - Description => $Description,); + Description => $Description, + Pattern => $Pattern,); $m->comp("/Elements/Error", Why => loc( "Could not create CustomField", $msg ) ) unless ($val); push @results, $msg; $title = loc( 'Created CustomField [_1]', $CustomFieldObj->Name() ); @@ -124,7 +168,7 @@ else { $CustomFieldObj->Load($id) || $m->comp("/Elements/Error", Why => loc('No CustomField') ); $title = loc( 'Editing CustomField [_1]', $CustomFieldObj->Name() ); - my @attribs = qw( Name TypeComposite LookupType Description); + my @attribs = qw( Pattern Name TypeComposite LookupType Description LinkValueTo IncludeContentForValue); my @aresults = UpdateRecordObject( AttributesRef => \@attribs, Object => $CustomFieldObj, ARGSRef => \%ARGS ); @@ -167,7 +211,7 @@ foreach my $key (keys %ARGS) { # Update any existing values my $values = $CustomFieldObj->ValuesObj; while (my $value = $values->Next) { - foreach my $attr qw(Name Description SortOrder) { + foreach my $attr qw(Name Description SortOrder Category) { my $param = $paramtag.$value->Id."-".$attr; if ( $ARGS{$param} && ($value->$attr() ne $ARGS{$param})) { @@ -184,9 +228,10 @@ while (my $value = $values->Next) { # Add any new values if ($ARGS{$paramtag."new-Name"}) { - my ($id, $msg) = $CustomFieldObj->AddValue ( Name => $ARGS{$paramtag."new-Name"}, - Description => $ARGS{$paramtag."new-Description"}, - SortOrder => $ARGS{$paramtag."new-SortOrder"}); + my ($id, $msg) = $CustomFieldObj->AddValue ( + map { $_ => $ARGS{$paramtag."new-$_"} } + qw( Name Description SortOrder Category ) + ); push (@results, $msg); } @@ -206,6 +251,7 @@ $LookupType => undef $MaxValues => undef $SortOrder => undef $Description => undef +$Pattern => undef $Name => undef $SetEnabled => undef $Enabled => undef diff --git a/rt/html/Admin/CustomFields/Objects.html b/rt/html/Admin/CustomFields/Objects.html index 8f9e3657b..d829a0da3 100644 --- a/rt/html/Admin/CustomFields/Objects.html +++ b/rt/html/Admin/CustomFields/Objects.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -52,9 +54,9 @@ <& /Elements/ListActions, actions => \@results &> -
- - + + +

<&|/l&>Selected objects

<& /Admin/Elements/PickObjects, Objects => \@AssignedObjs, id => $id, Checked => 1 &> @@ -62,7 +64,7 @@ <& /Admin/Elements/PickObjects, Objects => \@UnassignedObjs, id => $id &> <& /Elements/Submit, CheckAll => 1, ClearAll => 1 &> -
+ <%INIT> my $CF = RT::CustomField->new($session{'CurrentUser'}); diff --git a/rt/html/Admin/CustomFields/UserRights.html b/rt/html/Admin/CustomFields/UserRights.html index e2df3a058..a7145977c 100644 --- a/rt/html/Admin/CustomFields/UserRights.html +++ b/rt/html/Admin/CustomFields/UserRights.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -49,31 +51,31 @@ current_tab => "Admin/CustomFields/UserRights.html?id=".$id, Title => $title, &> <& /Elements/ListActions, actions => \@results &> -
- + + - +
% while (my $Member = $Users->Next()) { % my $UserObj = $Member->MemberObj->Object(); % my $group = RT::Group->new($session{'CurrentUser'}); % $group->LoadACLEquivalenceGroup($Member->MemberObj); - - + - + - + + % } -
+
<% $UserObj->Name %> - + <& /Admin/Elements/SelectRights, PrincipalId=> $group->PrincipalId, Object => $CustomFieldObj &> -
+ <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &> -
+ <%INIT> diff --git a/rt/html/Admin/CustomFields/index.html b/rt/html/Admin/CustomFields/index.html index 9854fb0ec..badee95a7 100644 --- a/rt/html/Admin/CustomFields/index.html +++ b/rt/html/Admin/CustomFields/index.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -48,29 +50,44 @@ current_tab => 'Admin/CustomFields/', Title => loc('Select a Custom Field') &> +% my @types; % my $prev_lookup = ''; % while (my $CustomFieldObj = $CustomFields->Next) { % $CustomFieldObj->CurrentUserHasRight('AdminCustomField') or next; % my $lookup = $CustomFieldObj->FriendlyLookupType; % if ($lookup ne $prev_lookup) { % if ($prev_lookup) { - + % } -

<% loc("Custom Fields for [_1]", $lookup) %>

- % } +
+<&|/l&>Only show custom fields for: + +
+ +<%args> +$type => undef + <%INIT> my $CustomFields = RT::CustomFields->new($session{'CurrentUser'}); $CustomFields->UnLimit(); +$CustomFields->LimitToLookupType($type) if defined $type; $CustomFields->OrderByCols( { FIELD => 'LookupType' }, { FIELD => 'Name' } ); diff --git a/rt/html/Admin/Elements/AddCustomFieldValue b/rt/html/Admin/Elements/AddCustomFieldValue index 3e3f414b3..39916e5ab 100644 --- a/rt/html/Admin/Elements/AddCustomFieldValue +++ b/rt/html/Admin/Elements/AddCustomFieldValue @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -43,22 +45,28 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -<&|/l&>Add Value - - - - -
-<&|/l&>Sort:
- -		 -<&|/l&>Name:
- -		 -<&|/l&>Description:
- -
- +<&|/l&>Add Value + + + + +% if ($CustomField->Type ne 'Combobox') { + +% } + +
+<&|/l&>Sort:
+ +		 +<&|/l&>Name:
+ +		 +<&|/l&>Description:
+ +		 +<&|/l&>Category:
+ +
<%init> <%args> diff --git a/rt/html/Admin/Elements/CreateUserCalled b/rt/html/Admin/Elements/CreateUserCalled index 0dc6ac792..69183258e 100644 --- a/rt/html/Admin/Elements/CreateUserCalled +++ b/rt/html/Admin/Elements/CreateUserCalled @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -43,6 +45,6 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -
-<&|/l&>New user called + +<&|/l&>New user called
diff --git a/rt/html/Admin/Elements/CustomFieldTabs b/rt/html/Admin/Elements/CustomFieldTabs index d7acf33cc..078dbe0de 100644 --- a/rt/html/Admin/Elements/CustomFieldTabs +++ b/rt/html/Admin/Elements/CustomFieldTabs @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: diff --git a/rt/html/Admin/Elements/EditCustomField b/rt/html/Admin/Elements/EditCustomField index d8c5b29b2..d6dda06f3 100644 --- a/rt/html/Admin/Elements/EditCustomField +++ b/rt/html/Admin/Elements/EditCustomField @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -46,43 +48,43 @@ <& /Elements/ListActions, actions => \@results &> -
- - + + + - - + +
+ + - + - + - -
<&|/l&>Name: - - -
+ + +
<&|/l&>Description: - - -
+ + +
<&|/l&>Type: - + <& /Admin/Elements/SelectCustomFieldType, Name => "Type", Default => $CustomFieldObj->Type &> -
- - -> <&|/l&>Enabled (Unchecking this box disables this custom field) -
- -

+

+ + + /> <&|/l&>Enabled (Unchecking this box disables this custom field) +
+ +

% if ($CustomFieldObj->Id and $CustomFieldObj->Type =~ /Select/) {

<&|/l&>Values

- + <& /Admin/Elements/EditCustomFieldValues, CustomField => $CustomFieldObj &> <& /Admin/Elements/AddCustomFieldValue, CustomField => $CustomFieldObj &> % } <&/Elements/Submit, Label => loc('Create') &> - + diff --git a/rt/html/Admin/Elements/EditCustomFieldValues b/rt/html/Admin/Elements/EditCustomFieldValues index 9cc3858b9..e7da87cf7 100644 --- a/rt/html/Admin/Elements/EditCustomFieldValues +++ b/rt/html/Admin/Elements/EditCustomFieldValues @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -54,23 +56,33 @@ <&|/l&>Sort <&|/l&>Name <&|/l&>Description +% if ($CustomField->Type ne 'Combobox') { +<&|/l&>Category +% } % while (my $value = $values->Next) { - + + + + - + - + + + +% if ($CustomField->Type ne 'Combobox') { - + +% } % } diff --git a/rt/html/Admin/Elements/EditCustomFields b/rt/html/Admin/Elements/EditCustomFields index 1cd3df568..9b1176a40 100644 --- a/rt/html/Admin/Elements/EditCustomFields +++ b/rt/html/Admin/Elements/EditCustomFields @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -45,11 +47,11 @@ %# END BPS TAGGED BLOCK }}} <& /Elements/ListActions, actions => \@results &> -
- - - - + + + + + % if ($Object->Id) {

<&|/l&>Global Custom Fields

@@ -61,7 +63,7 @@ <& PickCustomFields, CustomFields => \@UnassignedCFs, id => $id, SubType => $SubType &> <& /Elements/Submit, CheckAll => 1, ClearAll => 1 &> -
+ <%INIT> @@ -71,7 +73,7 @@ my (@GlobalCFs, @UnassignedCFs); my $id = $Object->Id; if ($id and !$Object->CurrentUserHasRight('AssignCustomFields')) { - $m->out('

', loc('(No custom fields)'), '

'); + $m->out('

', loc('(No custom fields)'), '

'); return; } @@ -88,6 +90,20 @@ $ObjectCFs->UnLimit; $ObjectCFs->LimitToObjectId($id); $ObjectCFs->LimitToLookupType($lookup); +# Check sanity of SortOrders +my %SortOrders; +$SortOrders{$_->SortOrder}++ + while ($_ = $ObjectCFs->Next); + +# If there are duplicates, run though and squash them +if (grep {$_ > 1} values %SortOrders) { + my $i = 1; + while (my $ObjectCF = $ObjectCFs->Next) { + $ObjectCF->SetSortOrder($i++); + } + $ObjectCFs->GotoFirstItem; +} + # {{{ deal with moving sortorder of custom fields if ($CustomField and $Move) { my $SourceObj = RT::ObjectCustomField->new($session{'CurrentUser'}); diff --git a/rt/html/Admin/Elements/EditQueueWatchers b/rt/html/Admin/Elements/EditQueueWatchers index c93bf81f5..dc076f58a 100644 --- a/rt/html/Admin/Elements/EditQueueWatchers +++ b/rt/html/Admin/Elements/EditQueueWatchers @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -47,12 +49,12 @@
  • <&|/l&>none % } else { -<&|/l&>(Check box to delete)

    +<&|/l&>(Check box to delete)

      % while (my $watcher=$Members->Next) {
    • - + % if ($watcher->MemberObj->IsUser) { % } else { diff --git a/rt/html/Admin/Elements/EditScrip b/rt/html/Admin/Elements/EditScrip index 907ae9a92..edf949ba3 100644 --- a/rt/html/Admin/Elements/EditScrip +++ b/rt/html/Admin/Elements/EditScrip @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -44,150 +46,95 @@ %# %# END BPS TAGGED BLOCK }}} <& /Elements/ListActions, actions => \@actions &> - -
      - - -<& /Elements/TitleBoxStart, title => loc('Scrip Fields') &> - - - - - - - - - - - - - - - - - - - - + + + + +<&| /Widgets/TitleBox, title => loc('Scrip Fields') &> +
      -<&|/l&>Description: - - -
      -<&|/l&>Condition: - -<& /Admin/Elements/SelectScripCondition, Name => "Scrip-$id-ScripCondition", Default => $scrip->ConditionObj->Id &>
      -
      -<&|/l&>Action: - -<& /Admin/Elements/SelectScripAction, Name => "Scrip-$id-ScripAction", Default => $scrip->ActionObj->Id &> -
      -<&|/l&>Template: - -<& /Admin/Elements/SelectTemplate, Name => "Scrip-$id-Template", Default => $scrip->TemplateObj->Id, Queue => $Queue &> -
      -<&|/l&>Stage: - -<& /Admin/Elements/SelectStage, Name => "Scrip-$id-Stage", Default => $scrip->Stage &> -
      + + + + + + + + + + +
      <&|/l&>Description: +Description %>" /> +
      <&|/l&>Condition: +<& /Admin/Elements/SelectScripCondition, + Name => "Scrip-$id-ScripCondition", + Default => $ARGS{"Scrip-$id-ScripCondition"} || $scrip->ConditionObj->Id, +&>
      <&|/l&>Action: +<& /Admin/Elements/SelectScripAction, + Name => "Scrip-$id-ScripAction", + Default => $ARGS{"Scrip-$id-ScripAction"} || $scrip->ActionObj->Id, +&>
      <&|/l&>Template: +<& /Admin/Elements/SelectTemplate, + Name => "Scrip-$id-Template", + Default => $ARGS{"Scrip-$id-Template"} || $scrip->TemplateObj->Id, + Queue => $Queue, +&>
      <&|/l&>Stage: +<& /Admin/Elements/SelectStage, + Name => "Scrip-$id-Stage", + Default => $ARGS{"Scrip-$id-Stage"} || $scrip->Stage, +&>
      -<& /Elements/TitleBoxEnd &> -<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &> + + +<& /Elements/Submit, + Label => $SubmitLabel, + Caption => loc("Be sure to save your changes"), + Reset => 1, +&>
      -
      -<& /Elements/TitleBoxStart, title => loc('User Defined conditions and actions') &> +<&| /Widgets/TitleBox, title => loc('User Defined conditions and actions') &> - - - - - - - - - - - - - - - + + + + + + + +
      +
      <&|/l&>(Use these fields when you choose 'User Defined' for a condition or action) -
      -<&|/l&>Custom condition: - - -
      -<&|/l&>Custom action preparation code: - - -
      -<&|/l&>Custom action cleanup code: - - -
      <&|/l&>Custom condition: + +
      <&|/l&>Custom action preparation code: + +
      <&|/l&>Custom action cleanup code: + +
      -<& /Elements/TitleBoxEnd &> + -<& /Elements/Submit, Label => loc('Create'), Reset => 1 &> +<& /Elements/Submit, Label => $SubmitLabel, Reset => 1 &> -
      + <%init> -my (@actions); +my (@actions, $SubmitLabel); -my $scrip = new RT::Scrip($session{'CurrentUser'}); - -if ( $id eq 'new' ) { +my $scrip = RT::Scrip->new( $session{'CurrentUser'} ); - my ( $retval, $msg ) = $scrip->Create( - Queue => $Queue, - ScripAction => $ARGS{"Scrip-new-ScripAction"}, - ScripCondition => $ARGS{"Scrip-new-ScripCondition"}, - Template => $ARGS{"Scrip-new-Template"}, - Description => $ARGS{"Scrip-new-Description"}, - CustomPrepareCode => $ARGS{"Scrip-new-CustomPrepareCode"}, - CustomCommitCode => $ARGS{"Scrip-new-CustomCommitCode"}, - CustomIsApplicableCode => $ARGS{"Scrip-new-CustomIsApplicableCode"}, - ); - if ( defined $retval ) { - push @actions, $msg; - $id = $scrip->id; - } - else { - Abort( $msg); - } -} -elsif ($id) { - my ($val,$msg) =$scrip->Load($id); - if ($val) { - $id = $scrip->id; - } else { - Abort ($msg); +if ( $id ) { + $scrip->Load( $id ); + unless ( $id = $scrip->id ) { + push @actions, loc("Couldn't load scrip #[_1]", $id); } - my @attribs = qw ( - Queue - ScripAction - ScripCondition - Template - Stage - Description - CustomPrepareCode - CustomCommitCode - CustomIsApplicableCode - ); - my @results = UpdateRecordObject( AttributesRef => \@attribs, - AttributePrefix => 'Scrip-'.$scrip->Id, - Object => $scrip, - ARGSRef => \%ARGS ); - push (@actions, @results); + $SubmitLabel = loc('Update'); } -elsif ($ARGS{'create'}) { +unless ( $id ) { $id = 'new'; + $SubmitLabel = loc('Create'); } -# }}} <%ARGS> @@ -195,3 +142,42 @@ $id => undef $title => undef $Queue => 0 + +<%METHOD Process> +<%ARGS> +$id => undef +$Queue => undef + +<%INIT> +return ($id) unless $id; + +my $scrip = RT::Scrip->new( $session{'CurrentUser'} ); +if ( $id eq 'new' ) { + return $scrip->Create( + Queue => $Queue, + ScripAction => $ARGS{"Scrip-new-ScripAction"}, + ScripCondition => $ARGS{"Scrip-new-ScripCondition"}, + Template => $ARGS{"Scrip-new-Template"}, + Description => $ARGS{"Scrip-new-Description"}, + CustomPrepareCode => $ARGS{"Scrip-new-CustomPrepareCode"}, + CustomCommitCode => $ARGS{"Scrip-new-CustomCommitCode"}, + CustomIsApplicableCode => $ARGS{"Scrip-new-CustomIsApplicableCode"}, + ); +} +else { + $scrip->Load( $id ); + return (undef, loc("Couldn't load scrip #[_1]", $id)) + unless $scrip->id; + + my @attribs = qw(Queue ScripAction ScripCondition Template Stage + Description CustomPrepareCode CustomCommitCode CustomIsApplicableCode); + my @results = UpdateRecordObject( + AttributesRef => \@attribs, + AttributePrefix => 'Scrip-'.$scrip->Id, + Object => $scrip, + ARGSRef => \%ARGS + ); + return ($scrip->id, @results); +} + + diff --git a/rt/html/Admin/Elements/EditScrips b/rt/html/Admin/Elements/EditScrips index 9526118b5..f3ef8fbe5 100644 --- a/rt/html/Admin/Elements/EditScrips +++ b/rt/html/Admin/Elements/EditScrips @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -46,34 +48,35 @@ <& /Elements/ListActions, actions => \@actions &>
      - +

      <&|/l&>Current Scrips

      % if ($Scrips->Count == 0 ) { -

      <&|/l&>(No scrips)

      +

      <&|/l&>(No scrips)

      % } else { - -

      <&|/l&>(Check box to delete)

      +
      +

      <&|/l&>(Check box to delete)

      % while (my $scrip = $Scrips->Next ) { - - - + + - + + % } -
      - - -<% $scrip->Description || "(".loc('no value').")" |n %>
      +
      + + +<% $scrip->Description || "(".loc('no value').")" |n %>
      <&|/l, loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name) &>[_1] [_2] with template [_3] -
      + % } <& /Elements/Submit, Caption => loc("Delete selected scrips"), Label => loc("Delete") &>
      + <%init> my (@actions); @@ -92,6 +95,7 @@ else { $Scrips->LimitToGlobal(); } +$Scrips->OrderBy( FIELD => 'description' ); diff --git a/rt/html/Admin/Elements/EditTemplates b/rt/html/Admin/Elements/EditTemplates index 207ffd001..5d770ef75 100644 --- a/rt/html/Admin/Elements/EditTemplates +++ b/rt/html/Admin/Elements/EditTemplates @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -45,39 +47,39 @@ %# END BPS TAGGED BLOCK }}} <& /Elements/ListActions, actions => \@actions &> -
      - + + % if ($Templates->Count == 0 ) { -

      <&|/l&>(No templates)

      +

      <&|/l&>(No templates)

      % } else { - - -
      + + + - - + + + % my $count; % while (my $TemplateObj = $Templates->Next) { - - - - + + + + % } -
      <&|/l&>(Check box to delete) - -
      +
      - - - -<% loc($TemplateObj->Name) %> -
      <% loc($TemplateObj->Description) %> -
      + + + +<% loc($TemplateObj->Name) %> +
      <% loc($TemplateObj->Description) %> +
      +
      % } <& /Elements/Submit, Label => loc('Delete Template') &> -
      + <%INIT> my $Templates = RT::Templates->new($session{'CurrentUser'}); diff --git a/rt/html/Admin/Elements/EditUserComments b/rt/html/Admin/Elements/EditUserComments index fb96dc09a..5035189da 100644 --- a/rt/html/Admin/Elements/EditUserComments +++ b/rt/html/Admin/Elements/EditUserComments @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -44,10 +46,10 @@ %# %# END BPS TAGGED BLOCK }}} <& /Elements/Header, Title => "Comments about $name" &> -<&|/l&>These comments aren't generally visible to the user:
      - - - +<&|/l&>These comments aren't generally visible to the user:
      + + + <%ARGS> $UserObj => undef diff --git a/rt/html/Admin/Elements/GlobalCustomFieldTabs b/rt/html/Admin/Elements/GlobalCustomFieldTabs index 8d4eaca23..db69df817 100755 --- a/rt/html/Admin/Elements/GlobalCustomFieldTabs +++ b/rt/html/Admin/Elements/GlobalCustomFieldTabs @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: diff --git a/rt/html/Admin/Elements/GroupTabs b/rt/html/Admin/Elements/GroupTabs index 60edda40e..bf6a1cfa5 100644 --- a/rt/html/Admin/Elements/GroupTabs +++ b/rt/html/Admin/Elements/GroupTabs @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: diff --git a/rt/html/Admin/Elements/Header b/rt/html/Admin/Elements/Header index b80908094..e9b0356a1 100644 --- a/rt/html/Admin/Elements/Header +++ b/rt/html/Admin/Elements/Header @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: diff --git a/rt/html/Admin/Elements/ListGlobalCustomFields b/rt/html/Admin/Elements/ListGlobalCustomFields index 3df9d6292..24308fcd8 100644 --- a/rt/html/Admin/Elements/ListGlobalCustomFields +++ b/rt/html/Admin/Elements/ListGlobalCustomFields @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -47,7 +49,7 @@ % while (my $CustomFieldObj = $CustomFields->Next) { % $count++; <%$CustomFieldObj->id%>/<% loc($CustomFieldObj->Type) %>/<%$CustomFieldObj->Name%>: <%$CustomFieldObj->Description%> -
      +
      % } % if (!$count) { <&|/l&>(No custom fields) diff --git a/rt/html/Admin/Elements/ListGlobalScrips b/rt/html/Admin/Elements/ListGlobalScrips index 2e3791257..e2e8b15aa 100644 --- a/rt/html/Admin/Elements/ListGlobalScrips +++ b/rt/html/Admin/Elements/ListGlobalScrips @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -43,29 +45,28 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} - % if ($Scrips->Count == 0) { -

      <&|/l&>(No scrips)

      +

      <&|/l&>(No scrips)

      % } else { -       % } diff --git a/rt/html/Admin/Elements/ModifyTemplate b/rt/html/Admin/Elements/ModifyTemplate index 6749f3e65..b667e056b 100644 --- a/rt/html/Admin/Elements/ModifyTemplate +++ b/rt/html/Admin/Elements/ModifyTemplate @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -43,33 +45,33 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} - - - + + + + + + +
      + + + - - - - + + + + - - - - - - -
      <&|/l&>Name: - -
      -
      + +
      +
      <&|/l&>Description: - -
      -
      -<&|/l&>Content:
      -      		 - -
      +      		 +
      +
      +<&|/l&>Content:
      +      		 + +
      <%INIT> diff --git a/rt/html/Admin/Elements/ObjectCustomFields b/rt/html/Admin/Elements/ObjectCustomFields index a87e1579d..61a10cd2b 100644 --- a/rt/html/Admin/Elements/ObjectCustomFields +++ b/rt/html/Admin/Elements/ObjectCustomFields @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: diff --git a/rt/html/Admin/Elements/PickCustomFields b/rt/html/Admin/Elements/PickCustomFields index c2a30f9a3..7b88433f1 100644 --- a/rt/html/Admin/Elements/PickCustomFields +++ b/rt/html/Admin/Elements/PickCustomFields @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -46,35 +48,35 @@ % if (@CustomFields == 0) {

      <&|/l&>(None)

      % } else { - +
      % my $count; % foreach my $CustomFieldObj (@CustomFields) { - + % if (!$ReadOnly) { - + % } - - + + % # show 'move up' unless it's the first item % if ($count++ and $Checked) { - - + + % } -
      - -> - + +/> + - + + % if ($CustomFieldObj->Name) { <%$CustomFieldObj->Name%> % } else { (<&|/l&>no name) % } -
      +
      <%$CustomFieldObj->Description%> -       		+ <% $CustomFieldObj->FriendlyTypeComposite %> - + [<&|/l&>Move up] % } else { - + % } % # show 'move down' unless it's the last item @@ -82,10 +84,10 @@ % $m->print(' | ') if $count > 1; [<&|/l&>Move down] % } -
      + % } <%ARGS> @CustomFields diff --git a/rt/html/Admin/Elements/PickObjects b/rt/html/Admin/Elements/PickObjects index b07a88240..5fc086350 100644 --- a/rt/html/Admin/Elements/PickObjects +++ b/rt/html/Admin/Elements/PickObjects @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -44,33 +46,32 @@ %# %# END BPS TAGGED BLOCK }}} % if (@Objects == 0) { -

      <&|/l&>(None)

      +

      <&|/l&>(None)

      % } else { - +
      % my $count; % foreach my $Object (@Objects) { - + +% my $id = "Object-".$Object->id."-CF-".$id; % if (!$ReadOnly) { - + % } - -%# - - + + + % } -
      - -> - + +/> + + + -%# <% $CustomFieldObj->FriendlyTypeComposite %> -%#
      + % } <%ARGS> @Objects diff --git a/rt/html/Admin/Elements/QueueRightsForUser b/rt/html/Admin/Elements/QueueRightsForUser index 01f294a59..15af78464 100644 --- a/rt/html/Admin/Elements/QueueRightsForUser +++ b/rt/html/Admin/Elements/QueueRightsForUser @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -43,13 +45,13 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -
        +
          %while(my $ACE = $ACL->Next) { -
        • <% loc($ACE->RightName) %> (<%$ACE->UserObj->RealName%>) +
        • <% loc($ACE->RightName) %> (<%$ACE->UserObj->RealName%>) %} -
        +
      <%INIT> my $ACL = new RT::ACL($session{'CurrentUser'}); diff --git a/rt/html/Admin/Elements/QueueTabs b/rt/html/Admin/Elements/QueueTabs index 93522d0a2..0d0670468 100644 --- a/rt/html/Admin/Elements/QueueTabs +++ b/rt/html/Admin/Elements/QueueTabs @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: diff --git a/rt/html/Admin/Elements/SelectCustomFieldLookupType b/rt/html/Admin/Elements/SelectCustomFieldLookupType index ec9f740b9..ff8bfdb3b 100644 --- a/rt/html/Admin/Elements/SelectCustomFieldLookupType +++ b/rt/html/Admin/Elements/SelectCustomFieldLookupType @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -43,11 +45,11 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} - %for my $option ($cf->LookupTypes) { - + %} - + <%INIT> my $cf = RT::CustomField->new($session{'CurrentUser'}); diff --git a/rt/html/Admin/Elements/SelectCustomFieldType b/rt/html/Admin/Elements/SelectCustomFieldType index 3f25b8e71..c913979e9 100644 --- a/rt/html/Admin/Elements/SelectCustomFieldType +++ b/rt/html/Admin/Elements/SelectCustomFieldType @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -43,11 +45,11 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} - %for my $option ($cf->TypeComposites) { - + %} - + <%INIT> my $cf = RT::CustomField->new($session{'CurrentUser'}); diff --git a/rt/html/Admin/Elements/SelectGroups b/rt/html/Admin/Elements/SelectGroups index 92bd47587..662273a0a 100644 --- a/rt/html/Admin/Elements/SelectGroups +++ b/rt/html/Admin/Elements/SelectGroups @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -43,11 +45,11 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} - %while (my $group = $groups->Next) { - % } <%INIT> if ($Default eq '') { diff --git a/rt/html/Admin/Elements/SelectTemplate b/rt/html/Admin/Elements/SelectTemplate index 7d83b6768..4f002c73a 100644 --- a/rt/html/Admin/Elements/SelectTemplate +++ b/rt/html/Admin/Elements/SelectTemplate @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -43,23 +45,23 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} - + <%INIT> @@ -67,10 +69,12 @@ my $PrimaryTemplates = RT::Templates->new($session{'CurrentUser'}); if ($Queue != 0) { $PrimaryTemplates->LimitToQueue($Queue); +$PrimaryTemplates->OrderBy(FIELD => 'Name'); } my $OtherTemplates = RT::Templates->new($session{'CurrentUser'}); $OtherTemplates->LimitToGlobal($DefaultQueue); +$OtherTemplates->OrderBy(FIELD => 'Name'); <%ARGS> diff --git a/rt/html/Admin/Elements/SelectUsers b/rt/html/Admin/Elements/SelectUsers index a88aa8ff7..103ab30fc 100644 --- a/rt/html/Admin/Elements/SelectUsers +++ b/rt/html/Admin/Elements/SelectUsers @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +%# 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. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -43,11 +45,11 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} - %while (my $user = $users->Next) { -