Fixes filename and extension for cloudinary

georgia-cms · Mar 17, 2014 · e95f6b3 · e95f6b3
1 parent c51a58f
commit e95f6b3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/app/models/ckeditor/asset.rb b/app/models/ckeditor/asset.rb
@@ -29,7 +29,12 @@ def to_jq_upload
     }
   end
 
+  def short_name
+    @short_name ||= self.data.file.filename.dup.gsub(/(.*)\.#{extension}/, '\1') if data.file and data.file.filename
+  end
+
   def extension
+    self.data_content_type ||= self.data.file.content_type
     @extension ||= data_content_type.gsub(/.*\/(.*)/, '\1')
   end
 

diff --git a/app/models/ckeditor/picture.rb b/app/models/ckeditor/picture.rb
@@ -12,4 +12,13 @@ def pages
     @pages ||= contents.map(&:contentable).map(&:page).compact.uniq
   end
 
+  def filename
+    @filename ||=
+      if defined?(Cloudinary)
+        data_file_name.dup.gsub(/v\d{10}\/(.*)/, '\1') || data_file_name
+      else
+        data_file_name
+      end
+  end
+
 end
diff --git a/app/views/georgia/ckeditor/pictures/_picture.html.erb b/app/views/georgia/ckeditor/pictures/_picture.html.erb
@@ -4,7 +4,7 @@
   </td>
   <td class='thumbnail-cell'>
     <%= link_to picture.url_content, class: 'media-link bg-transparent', rel: 'shadowbox[gallery]' do %>
-      <%= image_tag picture.url(:tiny), title: picture.data_file_name, class: 'media-image' %>
+      <%= image_tag picture.url(:tiny), title: picture.filename, class: 'media-image' %>
     <% end %>
   </td>
   <td>

diff --git a/app/views/georgia/media/edit.html.erb b/app/views/georgia/media/edit.html.erb
@@ -8,7 +8,7 @@
     <div class="col-md-9">
 
       <h2>
-        <%= link_to @asset.data_file_name, @asset.url %>
+        <%= link_to @asset.filename, @asset.url %>
         <% unless @asset.is_a?(Ckeditor::Picture) %>
           <%= link_to icon_tag('link'), @asset.url, title: @asset.url, target: '_blank', class: 'btn btn-default' %>
         <% end -%>
@@ -25,7 +25,7 @@
               </span>
             <% end -%>
           </div>
-          <%= image_tag @asset.url(:content), title: @asset.data_file_name, class: 'media-image--inline' %>
+          <%= image_tag @asset.url(:content), title: @asset.filename, class: 'media-image--inline' %>
         </div>
       <% end -%>
     </div>
@@ -36,7 +36,7 @@
         </div>
         <div class="panel-body">
           <p>
-            <b>File Name</b>: <%= @asset.data_file_name %><br />
+            <b>File Name</b>: <%= @asset.filename %><br />
             <b>Content Type</b>: <%= @asset.data_content_type %><br />
             <% if @asset.is_a?(Ckeditor::Picture) %>
               <b>File Size</b>: <%= number_to_human_size(@asset.data_file_size) %><br />