[Rt-commit] rt branch, 4.4/improve-create-custom-field-message, repushed

[Maureen Mirville]

The branch 4.4/improve-create-custom-field-message was deleted and repushed:
       was ee061039b08fb2c3b72a9d535e10b7e5156d2f4e
       now a982ebd96888d31dbc28a10fe42bb11cb7dc72ee

1:  a8840bb = 1:  a8840bb Apply unset-field when cfs do not have a count
2:  51ebb5f = 2:  51ebb5f Add an option to treat attached email messages as normal file attachments
3:  cb464b4 = 3:  cb464b4 Restore attached email parsing when $TreatAttachedEmailAsFiles is not set
4:  5e5aa50 = 4:  5e5aa50 Tests for email file attachments
5:  733c523 = 5:  733c523 Initial test warning string updates
6:  6ba420c = 6:  6ba420c Document queue template name override
7:  ac62f5d = 7:  ac62f5d Forbid merging non-ticket objects
8:  09806ea = 8:  09806ea Verify default queue
9:  ee06103 ! 9:  a982ebd Improve message for adding/deleting a new custom field value
    @@ -1,11 +1,12 @@
     Author: Maureen E. Mirville <maureen at bestpractical.com>
     
    -    Improve message for adding a value to a custom field
    +    Improve message for adding/deleting a new custom field value
         
         When user is creating a custom field and adding values as options,
    -    previous message after adding a value, "Object created" was unclear.
    -    Message updated to make it clear user added a value to a custom
    -    field.
    +    or deleting existing values, previous message after adding a value,
    +    "Object created", and after deleting a value, "Object deleted", was
    +    unclear. Message updated to make it clear user added or deleted a
    +    specific custom field value.
         
         Fixes: I#32695
     
    @@ -13,14 +14,23 @@
     --- a/share/html/Admin/CustomFields/Modify.html
     +++ b/share/html/Admin/CustomFields/Modify.html
     @@
    +     foreach my $key ( keys %ARGS ) {
    +         next unless $key =~ /^Delete-$paramtag-(\d+)$/;
    +         my ($val, $msg) = $CustomFieldObj->DeleteValue( $1 );
    ++        my $cf_delete = $ARGS{ $paramtag . "-$1-Name" };
    ++        $msg = loc("Custom field value $cf_delete deleted") if $val;
    +         push (@results, $msg);
    +     }
    + 
    +@@
                      $ARGS{$paramtag."-new-$_"} =~ s/\s+$//;
                      $_ => $ARGS{ $paramtag ."-new-$_" } } grep { defined $ARGS{ $paramtag ."-new-$_" } } qw/ Name Description SortOrder Category/
              );
    --        push (@results, $msg);
    -+        push (@results, "New custom field value added");
    ++        my $cf_add = $ARGS{ $paramtag.'-new-Name' };
    ++        $msg = loc("Custom field value $cf_add added") if $id;
    +         push (@results, $msg);
              $added_cfv = 1 if $id;
      
    -         my $cfv = RT::CustomFieldValue->new( $session{CurrentUser} );
     
     diff --git a/t/web/cf_select_one.t b/t/web/cf_select_one.t
     --- a/t/web/cf_select_one.t