Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '2.6/custom-field-display' into 2.6-trunk

Conflicts:
	Makefile.PL
  • Loading branch information...
commit cea42559ad8b851b99fda2bb6f5dd0bf67c6ee95 2 parents b34cb05 + 45c558f
Kevin Falcone jibsheet authored
Showing with 5 additions and 3 deletions.
  1. +2 −2 Makefile.PL
  2. +3 −1 html/RTIR/Incident/Display.html
4 Makefile.PL
View
@@ -10,8 +10,8 @@ version_from('lib/RT/IR.pm');
if ($v[0] >= 4) {
die "\n\nThis version of RTIR doesn't work with RT 4.x, you have $RT::VERSION";
}
- unless ($v[0]>=3 && $v[1]>=8 && ($v[2]>=3 || $v[2]eq'HEAD')) {
- die "\n\nThis version of RTIR needs RT 3.8.3 at least, but don't work with RT 4.x, you have $RT::VERSION";
+ unless ($v[0]>=3 && $v[1]>=8 && ($v[2]>=6 || $v[2]eq'HEAD')) {
+ die "Current RTIR version needs RT 3.8.6 at least, you have $RT::VERSION";
}
}
4 html/RTIR/Incident/Display.html
View
@@ -59,9 +59,11 @@
<td class="label"><&|/l&>Time Worked</&>:</td>
<td class="value"><%loc('[_1] min', $TimeWorked)%></td>
</tr>
+
+<& /Elements/ShowCustomFields, Object => $TicketObj, Table => 0 &>
+
</table>
-<& /Elements/ShowCustomFields, Object => $TicketObj &>
</&>
Please sign in to comment.
Something went wrong with that request. Please try again.