[Rt-commit] r18499 - in rt/3.999/trunk: lib/RT/Interface lib/RT/Model share/html/Admin/CustomFields share/html/Admin/Elements share/html/Elements share/html/Search

falcone at bestpractical.com falcone at bestpractical.com
Fri Feb 20 20:06:31 EST 2009


Author: falcone
Date: Fri Feb 20 20:06:31 2009
New Revision: 18499

Modified:
   rt/3.999/trunk/lib/RT/Interface/Web.pm
   rt/3.999/trunk/lib/RT/Model/CustomFieldValue.pm
   rt/3.999/trunk/share/html/Admin/CustomFields/Modify.html
   rt/3.999/trunk/share/html/Admin/Elements/AddCustomFieldValue
   rt/3.999/trunk/share/html/Admin/Elements/EditCustomFieldValues
   rt/3.999/trunk/share/html/Elements/EditCustomFieldSelect
   rt/3.999/trunk/share/html/Search/Bulk.html
   rt/3.999/trunk/t/api/cf_combo_casacade.t

Log:
* Current implementation of Custom Field categories die
  Need to be redone correctly, possibly as linked CFs

Modified: rt/3.999/trunk/lib/RT/Interface/Web.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Interface/Web.pm	(original)
+++ rt/3.999/trunk/lib/RT/Interface/Web.pm	Fri Feb 20 20:06:31 2009
@@ -481,7 +481,7 @@
     }
 
     foreach my $arg ( keys %ARGS ) {
-        next if $arg =~ /-(?:magic|category)$/;
+        next if $arg =~ /-(?:magic)$/;
 
         if ( $arg =~ /^object-RT::Model::Transaction--CustomField-/ ) {
             $create_args{$arg} = $ARGS{$arg};
@@ -1099,7 +1099,6 @@
 
     my @results;
     foreach my $arg ( keys %{ $args{'ARGS'} } ) {
-        next if $arg =~ /category$/;
 
         # since http won't pass in a form element with a null value, we need
         # to fake it

Modified: rt/3.999/trunk/lib/RT/Model/CustomFieldValue.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Model/CustomFieldValue.pm	(original)
+++ rt/3.999/trunk/lib/RT/Model/CustomFieldValue.pm	Fri Feb 20 20:06:31 2009
@@ -83,7 +83,6 @@
         name         => '',
         description  => '',
         sort_order   => 0,
-        category     => '',
         @_,
     );
 
@@ -107,43 +106,9 @@
     );
     return ( $id, $msg ) unless $id;
 
-    if ( defined $args{'category'} && length $args{'category'} ) {
-
-        # $self would be loaded at this stage
-        my ( $status, $msg ) = $self->set_category( $args{'category'} );
-        unless ($status) {
-            Jifty->log->error("Couldn't set category: $msg");
-        }
-    }
-
     return ( $id, $msg );
 }
 
-sub category {
-    my $self = shift;
-    my $attr = $self->first_attribute('category') or return undef;
-    return $attr->content;
-}
-
-sub set_category {
-    my $self     = shift;
-    my $category = shift;
-    if ( defined $category && length $category ) {
-        return $self->set_attribute(
-            name    => 'category',
-            content => $category,
-        );
-    } else {
-        my ( $status, $msg ) = $self->delete_attribute('category');
-        unless ($status) {
-            Jifty->log->warn("Couldn't delete atribute: $msg");
-        }
-
-        # return true even if there was no category
-        return ( 1, _('category unset') );
-    }
-}
-
 sub validate_name {
     return defined $_[1] && length $_[1];
 }

Modified: rt/3.999/trunk/share/html/Admin/CustomFields/Modify.html
==============================================================================
--- rt/3.999/trunk/share/html/Admin/CustomFields/Modify.html	(original)
+++ rt/3.999/trunk/share/html/Admin/CustomFields/Modify.html	Fri Feb 20 20:06:31 2009
@@ -184,7 +184,7 @@
     # Update any existing values
     my $values = $CustomFieldObj->values_obj;
     while ( my $value = $values->next ) {
-        foreach my $attr qw(name description sort_order category) {
+        foreach my $attr qw(name description sort_order ) {
             my $param = "$paramtag-". $value->id ."-". $attr;
             next unless exists $ARGS{$param};
             next if ($value->$attr()||'') eq ($ARGS{$param}||'');
@@ -199,7 +199,7 @@
     if ( defined $ARGS{ $paramtag ."-new-name" } && length $ARGS{ $paramtag ."-new-name" } ) {
         my ($id, $msg) = $CustomFieldObj->add_value(
             map { $_ => $ARGS{ $paramtag ."-new-$_" } }
-                qw( name description sort_order category )
+                qw( name description sort_order )
         );
         push (@results, $msg);
     }

Modified: rt/3.999/trunk/share/html/Admin/Elements/AddCustomFieldValue
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Elements/AddCustomFieldValue	(original)
+++ rt/3.999/trunk/share/html/Admin/Elements/AddCustomFieldValue	Fri Feb 20 20:06:31 2009
@@ -53,9 +53,6 @@
 <th><&|/l&>Sort</&></th>
 <th><&|/l&>name</&></th>
 <th><&|/l&>description</&></th>
-% if ( $custom_field->type ne 'Combobox' ) {
-<th><&|/l&>category</&></th>
-% }
 </tr>
 
 % my $paramtag = "CustomField-". $custom_field->id ."-value-new";
@@ -63,9 +60,6 @@
 <td><input type="text" size="3"  name="<% $paramtag %>-sort_order"   /></td>
 <td><input type="text" size="25" name="<% $paramtag %>-name"        /></td>
 <td><input type="text" size="45" name="<% $paramtag %>-description" /></td>
-% if ( $custom_field->type ne 'Combobox' ) {
-<td><input type="text" size="10" name="<% $paramtag %>-category"    /></td>
-% }
 </tr>
 
 </table>

Modified: rt/3.999/trunk/share/html/Admin/Elements/EditCustomFieldValues
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Elements/EditCustomFieldValues	(original)
+++ rt/3.999/trunk/share/html/Admin/Elements/EditCustomFieldValues	Fri Feb 20 20:06:31 2009
@@ -57,9 +57,6 @@
 <th><&|/l&>Sort</&></th>
 <th><&|/l&>name</&></th>
 <th><&|/l&>description</&></th>
-% if ($custom_field->type ne 'Combobox') {
-<th><&|/l&>category</&></th>
-% }
 </tr>
 
 % while ( my $value = $values->next ) {
@@ -69,10 +66,6 @@
 <td><input type="text" size="3" name="<% $paramtag %>-sort_order" value="<% $value->sort_order %>" /></td>
 <td><input type="text" size="25" name="<% $paramtag %>-name" value="<% $value->name %>" /></td>
 <td><input type="text" size="45" name="<% $paramtag %>-description" value="<% $value->description %>" /></td>
-% if ( $custom_field->type ne 'Combobox' ) {
-<td><input type="text" size="10" name="<% $paramtag %>-category" value="<%
-    $value->category || '' %>" /></td>
-% }
 </tr>
 % }
 

Modified: rt/3.999/trunk/share/html/Elements/EditCustomFieldSelect
==============================================================================
--- rt/3.999/trunk/share/html/Elements/EditCustomFieldSelect	(original)
+++ rt/3.999/trunk/share/html/Elements/EditCustomFieldSelect	Fri Feb 20 20:06:31 2009
@@ -49,21 +49,10 @@
 %# each one limits the options of the final one a bit
 %# (perhaps by tweaking the .display style?)
 %       my $selected = 0;
-%       my @category;
 %       my $id = $name_prefix . $custom_field->id;
-%       my $out = $m->scomp('SELF:options', %ARGS, selected_ref => \$selected, category_ref => \@category);
-%       if (@category) {
-%#      XXX - Hide this select from w3m?
-      <select onchange="filter_cascade('<% $id %>-values', this.value)" name="<% $id %>-category">
-        <option value=""<% !$selected && qq[ selected="selected"] |n %>><&|/l&>-</&></option>
-%           foreach my $cat (@category) {
-%               my ($depth, $name) = @$cat;
-        <option value="<% $name %>"><% '&nbsp;' x $depth |n %><% $name %></option>
-%           }
-      </select><br />
-%       }
+%       my $out = $m->scomp('SELF:options', %ARGS, selected_ref => \$selected);
       <select name="<%$id%>-values" id="<%$id%>-values"
-%       if ( $rows && ( $multiple || !@category ) ) {
+%       if ( $rows && $multiple ) ) {
         size="<% $rows %>"
 %       }
         <% $multiple && qq[multiple="multiple"] |n %> >
@@ -89,27 +78,8 @@
 % $_ = lc $_ foreach @default;
 % my $selected;
 % my $CFVs = $custom_field->values;
-% my @levels;
 % while ( my $value = $CFVs->next ) {
 %       my $name = $value->name;
-%       my $category = $value->category || '';
-%       my $level = (split /:/, $category, 2)[0] || '';
-%       while (@levels) {
-%           if ($levels[-1] eq $level) {
-%               $level = '';
-%               last;
-%           } elsif (index($level, $levels[-1]) != 0) {
-%               $m->out('</optgroup>');
-%               pop @levels;
-%           } else {
-%               last;
-%           }
-%       }
-%       if ( length $level ) {
-%           push @$category_ref, [0+ at levels, $level];
-            <optgroup style="padding-left: <% @levels/2 %>em" label="<% $category %>">
-%           push @levels, $level;
-%       }
         <option value="<% $name %>"
 %       if ( grep $_ eq lc $name, @default )
 %       {
@@ -118,14 +88,10 @@
 %       }
         ><% $name %></option>
 % }
-% for (@levels) {
-            </optgroup>
-% }
 <%ARGS>
 $custom_field => undef
 @default => ()
 $values => undef
 $selected_ref => undef
-$category_ref => undef
 </%ARGS>
 </%METHOD>

Modified: rt/3.999/trunk/share/html/Search/Bulk.html
==============================================================================
--- rt/3.999/trunk/share/html/Search/Bulk.html	(original)
+++ rt/3.999/trunk/share/html/Search/Bulk.html	Fri Feb 20 20:06:31 2009
@@ -331,7 +331,6 @@
 
         foreach my $key (@$list) {
             my ( $cfid, $cf );
-            next if $key =~ /CustomField-(\d+)-Category$/;
             if ( $key =~ /CustomField-(\d+)-/ ) {
                 $cfid = $1;
                 $cf   = RT::Model::CustomField->new();

Modified: rt/3.999/trunk/t/api/cf_combo_casacade.t
==============================================================================
--- rt/3.999/trunk/t/api/cf_combo_casacade.t	(original)
+++ rt/3.999/trunk/t/api/cf_combo_casacade.t	Fri Feb 20 20:06:31 2009
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use RT::Test; use Test::More tests => 13;
+use RT::Test; use Test::More tests => 10;
 
 
 
@@ -21,7 +21,7 @@
 
 works($cf->create(@cf_args));
 
-# Set some CFVs with category markers
+# Set some CFVs
 
 my $t = new( 'RT::Model::Ticket');
 my ($id,undef,$msg) = $t->create(queue => $q->id, subject => 'CF Test');
@@ -29,21 +29,18 @@
 
 sub add_works {
     works(
-        $cf->add_value(name => $_[0], description => $_[0], category => $_[1])
+        $cf->add_value(name => $_[0], description => $_[0] )
     );
 };
 
-add_works('value1', '1. category A');
+add_works('value1');
 add_works('value2');
-add_works('value3', '1.1. A-sub one');
-add_works('value4', '1.2. A-sub two');
-add_works('value5', '');
+add_works('value3');
+add_works('value4');
+add_works('value5');
 
 my $cfv = $cf->values->first;
 is ($cf->values->count,5, "got 5 values");
 is($cfv->name, 'value1', "We got the first value");
-is($cfv->category, '1. category A');
-works($cfv->set_category('1. category AAA'));
-is($cfv->category, '1. category AAA');
 
 1;


More information about the Rt-commit mailing list