Merge branch 'master' of https://github.com/jgoodman/Freeside

[freeside.git] / rt / share / html / Admin / Queues / CustomField.html

diff --git a/rt/share/html/Admin/Queues/CustomField.html b/rt/share/html/Admin/Queues/CustomField.html
index 2663fab..b1e0b9e 100755 (executable)
--- a/rt/share/html/Admin/Queues/CustomField.html
+++ b/rt/share/html/Admin/Queues/CustomField.html
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -46,20 +46,15 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 <& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/QueueTabs, id => $QueueObj->Id, 
-    QueueObj => $QueueObj,                                                      
-    current_tab => 'Admin/Queues/CustomFields.html?id='.$QueueObj->id, 
-    current_subtab => $current_subtab, 
-    subtabs => $subtabs, 
-    Title => $title &>
+<& /Elements/Tabs &>
 
 <& /Admin/Elements/EditCustomField, title => $title, %ARGS &>
 
 <%INIT>
-my $QueueObj = new RT::Queue($session{'CurrentUser'});
+my $QueueObj = RT::Queue->new($session{'CurrentUser'});
 $QueueObj->Load($Queue);
 
-my ($title, $current_subtab);
+my ($title);
 
 unless($QueueObj->id) {
     Abort(loc("Queue [_1] not found", $Queue));
@@ -67,16 +62,8 @@ unless($QueueObj->id) {
 if ($CustomField) {
     $title = loc('Modify a CustomField for queue [_1]', $QueueObj->Name()); 
 }else {
-    $current_subtab = "Admin/Queues/CustomField.html?create=1&Queue=".$QueueObj->id;
     $title = loc('Create a CustomField for queue [_1]', $QueueObj->Name()); 
 }
-
-my $subtabs = {
-                A => { title => loc('New custom field'),
-                       path => "Admin/Queues/CustomField.html?create=1&Queue=".$QueueObj->id
-                          }
-             };
-
 </%INIT>
 <%ARGS>
 $CustomField => undef