[Rt-commit] rt branch, master, updated. rt-4.0.5-281-g870f3c1

[Thomas Sibley]

The branch, master has been updated
       via  870f3c1539e8d87c3b9bb8511b193c2c9509f56b (commit)
       via  ccaefa06669823f16f68ae586b140e45f0b8a6f3 (commit)
       via  03de89def32b1b293481a64fa096a54abf71750b (commit)
       via  a0f8c62259e73e230cbc172a7d2102721d885cd4 (commit)
       via  8d4d5506e9b456cc4367ee2b6f9e27443883cde6 (commit)
       via  eb5e9cc38e9ea252bc312c2bdadbb5ff3c53eb9f (commit)
       via  fabb4d9aedc3886f9d0ef95a7c29458def9db492 (commit)
       via  b9caf8464d02beeca693299979206256b659d54d (commit)
       via  d53afd711e102cef2c3e736193a7ed4af67d83ad (commit)
       via  7744ebdbdb1af048246f4e64be708d1387c35fee (commit)
       via  9579e53153843b226c24334d280a5f3a23d1526b (commit)
       via  35e822a8c65b2d5347c435a5fb8be4005e993c74 (commit)
       via  02c13b3f67bd74fa99e42d1257cea6fbc641e3bf (commit)
      from  d02bc28d4144712f37c423fd8285cdad43920e03 (commit)

Summary of changes:
 lib/RT/Class.pm                                    |   26 +++++
 share/html/Admin/Articles/Classes/Modify.html      |   32 ++++++-
 .../Elements/{CheckSkipCreate => SubjectOverride}  |   46 ++++++---
 share/html/Ticket/Create.html                      |    2 +
 share/html/Ticket/Update.html                      |    1 +
 t/articles/set-subject.t                           |  110 ++++++++++++++++++++
 6 files changed, 200 insertions(+), 17 deletions(-)
 copy share/html/Articles/Elements/{CheckSkipCreate => SubjectOverride} (66%)
 create mode 100644 t/articles/set-subject.t

- Log -----------------------------------------------------------------
commit 870f3c1539e8d87c3b9bb8511b193c2c9509f56b
Merge: d02bc28 ccaefa0
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Feb 17 13:34:22 2012 -0500

    Merge branch '4.2/update-subject-from-article'
    
    Conflicts:
    	share/html/Admin/Articles/Classes/Modify.html

diff --cc share/html/Admin/Articles/Classes/Modify.html
index 8dbd289,b0e289e..19d819e
--- a/share/html/Admin/Articles/Classes/Modify.html
+++ b/share/html/Admin/Articles/Classes/Modify.html
@@@ -88,16 -87,23 +88,29 @@@
      <li><input type="checkbox" name="Include-CF-Value-<% $cf->Id %>" <% $include{"CF-Value-".$cf->Id} %> />Value</li>
    </ul>
  </li>
 -% }
 +% } }
  </ul>
  
+ % if ( @$subject_cfs ) {
+ <h3>Change email subject:</h3>
+ <p><&|/l&>If a Custom Field is selected, the Subject of your outgoing email will be overridden by this article.</&></p>
+ 
+ <& /Widgets/Form/Select,
+     Name         => 'SubjectOverride',
+     DefaultLabel => 'No Subject Override',
+     Values       => $subject_cfs,
+     ValuesLabel  => $subject_cf_labels,
+     CurrentValue => $ClassObj->SubjectOverride,
+ &>
+ % }
+ 
 -<& /Elements/Submit &>
 +%$m->callback( CallbackName => 'BeforeSubmit', CustomFields => $cfs, ClassObj => $ClassObj );
 +
 +% if ( $Create ) {
 +<& /Elements/Submit, Label => loc('Create') &>
 +% } else {
 +<& /Elements/Submit, Label => loc('Save Changes') &>
 +% }
  </form>
  
  <%INIT>
@@@ -132,9 -127,18 +145,18 @@@ if ($Create) 
  }
  
  if ($ClassObj->Id()) {
+ 
+     if ($ARGS{SubjectOverride}) {
+         $ARGS{SubjectOverride} = $m->comp('/Widgets/Form/Select:Process',
+             Arguments => \%ARGS,
+             Name      => 'SubjectOverride',
+             DefaultValue => (''),
+         );
+     }
+ 
      $ARGS{HotList} ||= 0 if $Submitted;
-     my @attribs= qw(Description Name HotList);
+     my @attribs= qw(Description Name HotList SubjectOverride);
 +    $m->callback( CallbackName => 'AttributeList', Attributes => \@attribs, ARGSRef => \%ARGS );
      push @results, UpdateRecordObject( AttributesRef => \@attribs,
                                         Object => $ClassObj,
                                         ARGSRef => \%ARGS);
@@@ -148,14 -152,18 +170,20 @@@ if ((defined $Enabled && $Enabled == 1
  }
  
  my %include = (Name => 1, Summary => 1);
+ my $subject_cfs = [];
+ my $subject_cf_labels = {};
  
 -my $cfs = $ClassObj->ArticleCustomFields;
 -
 -while ( my $cf= $cfs->Next ) {
 -    $include{"CF-Title-".$cf->Id} = $include{"CF-Value-".$cf->Id} = 1;
 -    push @$subject_cfs,$cf->Id;
 -    $subject_cf_labels->{$cf->Id} = $cf->Name;
 +my $cfs;
 +if ( $ClassObj->id ) {
 +    $cfs = $ClassObj->ArticleCustomFields;
-     $include{"CF-Title-".$_->Id} = $include{"CF-Value-".$_->Id} = 1 while $_ = $cfs->Next;
++    while ( my $cf = $cfs->Next ) {
++        $include{"CF-Title-".$cf->Id} = $include{"CF-Value-".$cf->Id} = 1;
++        push @$subject_cfs,$cf->Id;
++        $subject_cf_labels->{$cf->Id} = $cf->Name;
++    }
  }
  
 -if  ( $Submitted ) {
 +if  ( $ClassObj->id && $Submitted ) {
      if ( $Disabled != $ClassObj->Disabled) {
          my  ($code, $msg) = $ClassObj->SetDisabled($Disabled);
          push @results, loc('Enabled status [_1]', loc_fuzzy($msg));

-----------------------------------------------------------------------