[Rt-commit] rt branch, 4.6/inline-edit, updated. rt-4.4.1-141-gb419a4a

[Shawn Moore]

The branch, 4.6/inline-edit has been updated
       via  b419a4aade693735ea0c1271a3f5091a4d409998 (commit)
      from  94a839870216f735519b86dec2744d2430971efd (commit)

Summary of changes:
 share/html/Elements/ColumnMap | 4 ++++
 1 file changed, 4 insertions(+)

- Log -----------------------------------------------------------------
commit b419a4aade693735ea0c1271a3f5091a4d409998
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Fri Sep 16 16:42:55 2016 +0000

    Don't offer inline edit for file or image uploads
    
        This Type expression is borrowed from RT::Interface::Web

diff --git a/share/html/Elements/ColumnMap b/share/html/Elements/ColumnMap
index f9a3cbb..50f782f 100644
--- a/share/html/Elements/ColumnMap
+++ b/share/html/Elements/ColumnMap
@@ -145,6 +145,10 @@ $WCOLUMN_MAP = $COLUMN_MAP = {
             my $self = $WCOLUMN_MAP->{CustomField};
             my $cf = $self->{load}->(@_);
             return unless $cf->Id;
+
+            # uploading files should be done on the modify page
+            return if $cf->Type =~ /^(?:Binary|Image)$/;
+
             return \($m->scomp('/Elements/EditCustomField', CustomField => $cf, Object => $_[0]))
         },
     },

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