[Rt-commit] r9874 - in rt/branches/3.6-EXPERIMENTAL-ABERDEEN: lib/RT/Extension

[audreyt at bestpractical.com]

Author: audreyt
Date: Mon Dec 10 14:45:36 2007
New Revision: 9874

Modified:
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Admin/RuleManager/Modify.html
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Admin/RuleManager/index.html
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/lib/RT/Extension/RuleManager.pm

Log:
* Simple rules are now globby syntaxed.

Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Admin/RuleManager/Modify.html
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Admin/RuleManager/Modify.html	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Admin/RuleManager/Modify.html	Mon Dec 10 14:45:36 2007
@@ -67,11 +67,11 @@
 </tr>
 
 <tr><td align="right">
-<&|/l&>Match Field</&>: 
+<&|/l&>Field</&>: 
 </td>
 <td>
 <& SELF:Select,
-    Name => 'Field',
+    Name    => 'Field',
     Options => [RT::Extension::RuleManager::FieldOptions],
     Default => ($Create ? '' : $RuleObj->Field),
 &>
@@ -79,7 +79,7 @@
 </tr>
 
 <tr><td align="right">
-<&|/l&>Match Pattern</&>: 
+<&|/l&>Match</&>: 
 </td>
 <td><input name="Pattern" value="<% ($Create) ? "" : $RuleObj->Pattern %>" /></td>
 </tr>
@@ -89,7 +89,7 @@
 </td>
 <td>
 <& SELF:Select,
-    Name => 'Handler',
+    Name    => 'Handler',
     Options => [RT::Extension::RuleManager::HandlerOptions],
     Default => ($Create ? '' : $RuleObj->Handler),
     Refresh => 1,

Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Admin/RuleManager/index.html
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Admin/RuleManager/index.html	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Admin/RuleManager/index.html	Mon Dec 10 14:45:36 2007
@@ -70,8 +70,8 @@
 <li>
 <a href="Modify.html?id=<%$rule->id%>"><% length($rule->Name) ? $rule->Name : '(#'.$rule->Id.')' %></a>
 <br />
-<% $rule->Field %> matches <tt>/<% $rule->Pattern %>/</tt><br />
-= <% $rule->Handler %> <% $rule->FormattedArgument %>
+<% $rule->Field %> matches &lt;<tt><% $rule->PrettyPattern %></tt>&gt;<br />
+= <% $rule->Handler %> <% $rule->PrettyArgument %>
 % if ($rule->Final) {
 <br />
 + <em><&|/l&>Stop processing the rules after this one.</&></em>

Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/lib/RT/Extension/RuleManager.pm
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/lib/RT/Extension/RuleManager.pm	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/lib/RT/Extension/RuleManager.pm	Mon Dec 10 14:45:36 2007
@@ -127,11 +127,19 @@
     RT::Extension::RuleManager->_save($self->{_root}) if $updated;
 }
 
-sub FormattedArgument {
+sub PrettyArgument {
     my $self = shift;
     ($self->Handler =~ /:$/) ? $self->Argument : '';
 }
 
+sub PrettyPattern {
+    my $self = shift;
+    my $pat = $self->Pattern;
+    return '*' if $pat eq '';
+    return "*$pat*" unless $pat =~ /[*?]/;
+    return $pat;
+}
+
 BEGIN {
     no strict 'refs';
     no warnings 'uninitialized';