rpms/rt3/F-10 rt-3.8.2-rh-bz526870.diff, NONE, 1.1 rt3.spec, 1.40, 1.41

[corsepiu]

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9015

Modified Files:
	rt3.spec 
Added Files:
	rt-3.8.2-rh-bz526870.diff 
Log Message:
* Mon Oct 12 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.8.2-10
- Add rt-3.8.2-rh-bz526870.diff (BZ #526870).


rt-3.8.2-rh-bz526870.diff:
 ShowCustomFields      |    2 
 ShowCustomFields.orig |  114 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 115 insertions(+), 1 deletion(-)

--- NEW FILE rt-3.8.2-rh-bz526870.diff ---
diff -Naur rt-3.8.2.orig/share/html/Elements/ShowCustomFields rt-3.8.2/share/html/Elements/ShowCustomFields
--- rt-3.8.2.orig/share/html/Elements/ShowCustomFields	2009-01-07 02:15:28.000000000 +0100
+++ rt-3.8.2/share/html/Elements/ShowCustomFields	2009-10-12 16:56:54.000000000 +0200
@@ -89,7 +89,7 @@
     if ( $m->comp_exists( $comp ) ) {
         $m->comp( $comp, Object => $value );
     } else {
-        $m->print( $value->Content );
+        $m->out( $m->interp->apply_escapes( $value->Content, 'h' ) );
     }
     $m->out('</a>') if $linked;
 
diff -Naur rt-3.8.2.orig/share/html/Elements/ShowCustomFields.orig rt-3.8.2/share/html/Elements/ShowCustomFields.orig
--- rt-3.8.2.orig/share/html/Elements/ShowCustomFields.orig	1970-01-01 01:00:00.000000000 +0100
+++ rt-3.8.2/share/html/Elements/ShowCustomFields.orig	2009-01-07 02:15:28.000000000 +0100
@@ -0,0 +1,114 @@
+%# BEGIN BPS TAGGED BLOCK {{{
+%# 
+%# COPYRIGHT:
+%# 
+%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
+%#                                          <jesse at bestpractical.com>
+%# 
+%# (Except where explicitly superseded by other copyright notices)
+%# 
+%# 
+%# LICENSE:
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work is distributed in the hope that it will be useful, but
+%# WITHOUT ANY WARRANTY; without even the implied warranty of
+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%# General Public License for more details.
+%# 
+%# You should have received a copy of the GNU General Public License
+%# along with this program; if not, write to the Free Software
+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+%# 02110-1301 or visit their web page on the internet at
+%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
+%# 
+%# 
+%# CONTRIBUTION SUBMISSION POLICY:
+%# 
+%# (The following paragraph is not intended to limit the rights granted
+%# to you to modify and distribute this software under the terms of
+%# the GNU General Public License and is only of importance to you if
+%# you choose to contribute your changes and enhancements to the
+%# community by submitting them to Best Practical Solutions, LLC.)
+%# 
+%# By intentionally submitting any modifications, corrections or
+%# derivatives to this work, or any other work intended for use with
+%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+%# royalty-free, perpetual, license to use, copy, create derivative
+%# works based on those contributions, and sublicense and distribute
+%# those contributions and any derivatives thereof.
+%# 
+%# END BPS TAGGED BLOCK }}}
+<table>
+% while ( my $CustomField = $CustomFields->Next ) {
+% my $Values = $Object->CustomFieldValues( $CustomField->Id );
+% my $count = $Values->Count;
+  <tr id="CF-<%$CustomField->id%>-ShowRow">
+    <td class="label"><% $CustomField->Name %>:</td>
+    <td class="value">
+% unless ( $count ) {
+<i><&|/l&>(no value)</&></i>
+% } elsif ( $count == 1 ) {
+%   $print_value->( $CustomField, $Values->First );
+% } else {
+<ul>
+% while ( my $Value = $Values->Next ) {
+<li>
+% $print_value->( $CustomField, $Value );
+</li>
+% }
+</ul>
+% }
+    </td>
+  </tr>
+% }
+</table>
+<%INIT>
+my $CustomFields = $Object->CustomFields;
+$m->callback( CallbackName => 'MassageCustomFields', CustomFields => $CustomFields );
+
+my $print_value = sub {
+    my ($cf, $value) = @_;
+    my $linked = $cf->LinkValueTo;
+    if ( $linked ) {
+        $m->out('<a href="'. $value->LinkValueTo .'" target="_new">');
+    }
+    my $comp = "ShowCustomField". $cf->Type;
+    $m->callback(
+        CallbackName => 'ShowComponentName',
+        Name         => \$comp,
+        CustomField  => $cf,
+        Object       => $Object,
+    );
+    if ( $m->comp_exists( $comp ) ) {
+        $m->comp( $comp, Object => $value );
+    } else {
+        $m->print( $value->Content );
+    }
+    $m->out('</a>') if $linked;
+
+    # This section automatically populates a div with the "IncludeContentForValue" for this custom
+    # field if it's been defined
+    if ( $cf->IncludeContentForValue ) {
+       my $vid = $value->id;
+       $m->out(   '<div class="object_cf_value_include" id="object_cf_value_'. $vid .'">' );
+       $m->print( loc("See also:") );
+       $m->out(   '<a href="'. $value->IncludeContentForValue .'">' );
+       $m->print( $value->IncludeContentForValue );
+       $m->out(   qq{</a></div>\n} );
+       $m->out(   qq{<script><!--\nahah('} );
+       $m->print( $value->IncludeContentForValue );
+       $m->out(   qq{', 'object_cf_value_$vid');\n--></script>\n} );
+    }
+};
+
+</%INIT>
+<%ARGS>
+$Object => undef
+</%ARGS>


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-10/rt3.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- rt3.spec	24 Jun 2009 22:02:39 -0000	1.40
+++ rt3.spec	12 Oct 2009 15:37:42 -0000	1.41
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.2
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -55,11 +55,17 @@ Patch0:		rt-3.8.1-config.diff
 Patch2:		rt-3.8.1-Makefile.diff
 Patch3:		rt-3.8.1-test-dependencies.diff
 
-# Address https://bugzilla.redhat.com/show_bug.cgi?id=506236
+# https://bugzilla.redhat.com/show_bug.cgi?id=506236
 # Patch from http://lists.bestpractical.com/pipermail/rt-announce/2009-June/000170.html
 # Fixed in rt >= 3.8.4
 Patch4:		rt-3.8.2-rh-bz506236.diff
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=526870
+# Patch from http://lists.bestpractical.com/pipermail/rt-announce/2009-September/000173.html
+# Fixed in rt >= 3.8.5
+Patch5:		rt-3.8.2-rh-bz526870.diff
+
+
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -238,6 +244,7 @@ find etc -type f -exec chmod a-x {} \;
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # Patch backups added by rpm disturb
 find -name '*.orig' -exec rm -f {} \;
@@ -437,6 +444,9 @@ fi
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Mon Oct 12 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.8.2-10
+- Add rt-3.8.2-rh-bz526870.diff (BZ #526870).
+
 * Wed Jun 24 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.8.2-9
 - Add R: perl(Data::ICal), R: perl(Data::ICal::Entry::Event) (BZ #507965).