[Rt-commit] [svn] r1275 - in rt/branches/3.3-TESTING: . html/Admin/Elements

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Thu Jul 22 14:36:03 2004
New Revision: 1275

Modified:
   rt/branches/3.3-TESTING/   (props changed)
   rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFields
   rt/branches/3.3-TESTING/html/Admin/Elements/PickCustomFields
Log:

 ----------------------------------------------------------------------
 r8279 at tinbook:  jesse | 2004-07-22T18:33:54.229892Z
 
 * Allow the move up/move down links to work for custom field ordering
 ----------------------------------------------------------------------



Modified: rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFields
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFields	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFields	Thu Jul 22 14:36:03 2004
@@ -53,12 +53,12 @@
 
 % if ($Object->Id) {
 <h2><&|/l&>Global Custom Fields</&></h2>
-<& PickCustomFields, CustomFields => \@GlobalCFs, ReadOnly => 1, id => $id &>
+<& PickCustomFields, CustomFields => \@GlobalCFs, ReadOnly => 1, id => $id, SubType => $SubType &>
 % }
 <h2><&|/l&>Selected Custom Fields</&></h2>
-<& PickCustomFields, CustomFields => [$ObjectCFs->CustomFields], id => $id, Checked => 1 &>
+<& PickCustomFields, CustomFields => [$ObjectCFs->CustomFields], id => $id, Checked => 1, SubType => $SubType &>
 <h2><&|/l&>Unselected Custom Fields</&></h2>
-<& PickCustomFields, CustomFields => \@UnassignedCFs, id => $id &>
+<& PickCustomFields, CustomFields => \@UnassignedCFs, id => $id, SubType => $SubType &>
 
 <& /Elements/Submit, CheckAll => 1, ClearAll => 1 &>
 </FORM>

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/PickCustomFields
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/PickCustomFields	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/PickCustomFields	Thu Jul 22 14:36:03 2004
@@ -60,11 +60,13 @@
   </TD>
 %   }
   <TD valign="TOP">
+    <A HREF="<%$RT::WebPath%>/Admin/CustomFields/Modify.html?id=<%$CustomFieldObj->id()%>">
 % if ($CustomFieldObj->Name) {
-    <A HREF="/Admin/CustomFields/Modify.html?id=<%$CustomFieldObj->id()%>"><b><%$CustomFieldObj->Name%></b></a><br>
+<b><%$CustomFieldObj->Name%></b>
 % } else {
-    <A HREF="/Admin/CustomFields/Modify.html?id=<%$CustomFieldObj->id()%>"><i>(<%loc("no name")%>)</i></a><br>
+<i>(<&|/l&>no name</&>)</i>
 % }
+</a><br>
     <%$CustomFieldObj->Description%>
   </TD>
   <TD valign="TOP">
@@ -73,7 +75,7 @@
 %  # show 'move up' unless it's the first item
 %  if ($count++ and $Checked) {
   <TD valign="TOP">
-    [<a href="CustomFields.html?id=<%$id%>&CustomField=<%$CustomFieldObj->id%>&Move=-1"><&|/l&>Move up</&></a>]
+    [<a href="CustomFields.html?id=<%$id%>&SubType=<%$SubType%>&CustomField=<%$CustomFieldObj->id%>&Move=-1"><&|/l&>Move up</&></a>]
 %  } else {
   <TD valign="TOP" ALIGN=RIGHT>
 %  }
@@ -81,7 +83,7 @@
 %  # show 'move down' unless it's the last item
 %  if ($count != @CustomFields and $Checked) {
 %  $m->print(' | ') if $count > 1;
-    [<a href="CustomFields.html?id=<%$id%>&CustomField=<%$CustomFieldObj->id%>&Move=1"><&|/l&>Move down</&></a>]
+    [<a href="CustomFields.html?id=<%$id%>&SubType=<%$SubType%>&CustomField=<%$CustomFieldObj->id%>&Move=1"><&|/l&>Move down</&></a>]
 %  }
   </TD>
 </TR>
@@ -93,4 +95,5 @@
 $id
 $ReadOnly => 0
 $Checked => 0
+$SubType
 </%ARGS>