effective_assets 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c87aaa1f7bea793889c220aa1a78764d0a7f6bb1
-  data.tar.gz: ec17d7a9054ea3b8de1bd533bd8612f362f299a5
+  metadata.gz: f018916536c26112201f9310749f01c6d29daafe
+  data.tar.gz: dbfcdb4b2b86a7a206f993632bd52ac1cfe094f5
 SHA512:
-  metadata.gz: 48e653a86aea67db00958a15bfc91b96daf223f091bf3148b3a876e0ed67ad31cf2de1dfedb220d805e482c87642dae9a14ec19e523a14fb54601f530514f173
-  data.tar.gz: 9764b9185790dac272758a48d481d41e4319c7eee88672b02b2bc450d9aacf40d2b742f8c905a11233ed5ba34ae7fea6039ce19706bb3b4727f47426f2b9706c
+  metadata.gz: 43fb4505fa7070cf9bd360b61b14e9f4f1f312a2f74dcc6ad0f4f88e3ce2395397002e2113204f5ad9e83fecc30bf3bedf7ea109eaec069221725ef95dd9cf93
+  data.tar.gz: 29305b62ab227d99114bcd550066420bd07791f6474f712640009284324718a160418a827057581a108c0aab8a2db075cc5ce1d1f30e912ab74d51eefd136e02

data/app/controllers/effective/s3_uploads_controller.rb

@@ -44,6 +44,7 @@ module Effective
         attachment.position = 0
         attachable_object_name = params[:attachable_object_name].to_s
         attachment_actions = params[:attachment_actions]
+        attachment_links = params[:attachment_links]
 
         attachment_partial =
         case params[:attachment_style].to_s
@@ -55,7 +56,7 @@ module Effective
           'attachment_as_thumbnail'
         end
 
-        render :partial => "asset_box_input/#{attachment_partial}", :locals => {:attachment => attachment, :attachable_object_name => attachable_object_name, :attachment_actions => attachment_actions}, :status => 200, :content_type => 'text/html'
+        render :partial => "asset_box_input/#{attachment_partial}", :locals => {:attachment => attachment, :attachable_object_name => attachable_object_name, :attachment_actions => attachment_actions, attachment_links: attachment_links}, :status => 200, :content_type => 'text/html'
       else
         render :text => '', :status => 200
       end

data/app/models/inputs/asset_box.rb

@@ -133,6 +133,7 @@ module Inputs
           :locals => {
             :attachment => attachment,
             :attachment_actions => @options[:attachment_actions].map(&:to_s),
+            :attachment_links => @options[:attachment_links],
             :hidden => (count > @options[:limit]),
             :disabled => @options[:disabled],
             :attachable_object_name => @object_name,
@@ -156,6 +157,7 @@ module Inputs
         :drop_files_help_text => 'Drop files here',
         :progress_bar_partial => 'asset_box_input/progress_bar_template',
         :attachment_style => :thumbnail,  # :thumbnail, :table, or :list
+        :attachment_links => true,
         :attachment_add_to => :bottom, # :bottom or :top (of attachments div)
         :attachment_actions => [:remove], # or :insert, :delete, :remove
         :table_filter_bar => false,

data/app/views/asset_box_input/_attachment_as_list.html.haml

@@ -3,7 +3,10 @@
 
 %li.attachment
   .attachment-title.caption
-    = link_to attachment.asset.title, attachment.asset.url, :target => '_blank'
+    - if attachment_links
+      = link_to attachment.asset.title, attachment.asset.url, :target => '_blank'
+    - else
+      = attachment.asset.title
 
   - if attachment_actions.include?('remove')
     %a.attachment-remove{:href => '#'}

data/app/views/asset_box_input/_attachment_as_table.html.haml

@@ -5,7 +5,10 @@
   %td.attachment-image
     = effective_asset_image_tag(attachment.asset)
   %td.attachment-title{:title => effective_asset_title(attachment.asset)}
-    = link_to attachment.asset.title, attachment.asset.url, :target => '_blank'
+    - if attachment_links
+      = link_to attachment.asset.title, attachment.asset.url, :target => '_blank'
+    - else
+      = attachment.asset.title
   %td.attachment-size
     = number_to_human_size(attachment.asset.data_size)
   %td

data/app/views/asset_box_input/_attachment_as_thumbnail.html.haml

@@ -6,7 +6,10 @@
     = effective_asset_image_tag(attachment.asset)
 
     .attachment-title.caption
-      = link_to attachment.asset.title, attachment.asset.url, :target => '_blank'
+      - if attachment_links
+        = link_to attachment.asset.title, attachment.asset.url, :target => '_blank'
+      - else
+        = attachment.asset.title
 
     - if attachment_actions.include?('remove')
       %a.attachment-remove{:href => '#'}

data/lib/effective_assets/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAssets
-  VERSION = '1.4.6'.freeze
+  VERSION = '1.4.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_assets
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails