admin_controller.rb in neofiles-1.1.1

- old
+ new

@@ -31,10 +31,11 @@
   #   request[:append_create] - after persisting new file, action should return form for the file + an upload form
   #                             (default '0')
   #   request[:disabled]      - only show file, not allow anything to be edited (default '0')
   #   request[:multiple]      - allow uploading of multiple files at once (default '0')
   #   request[:with_desc]     - show short file description (default '0')
+  #   request[:no_wm]         - disable adding a watermark  (default '0')
   #
   # Parameters clear_remove & append_create are used to organize Albums — technically a collection of single files.
   #
   def file_compact(fake_request = nil)
     request = fake_request || self.request
@@ -52,10 +53,11 @@
     @clean_remove   = request[:clean_remove].present? && request[:clean_remove] != '0'
     @append_create  = request[:append_create].present? && request[:append_create] != '0'
     @disabled       = request[:disabled].present? && request[:disabled] != '0'
     @multiple       = request[:multiple].present? && request[:multiple] != '0'
     @with_desc      = request[:with_desc].present? && request[:with_desc] != '0'
+    @no_wm          = request[:no_wm].present? && request[:no_wm] != '0'
     @error        ||= ''
 
     if fake_request
       return render_to_string action: :file_compact, layout: false
     else
@@ -85,9 +87,10 @@
       errors.push("#{I18n.t('neofiles.file_not_passed')} (#{i + 1})") and next unless uploaded_file.respond_to? :read
 
       file_class = Neofiles::File.class_by_file_object(uploaded_file)
       file = file_class.new do |f|
         f.description = data[:description].presence || old_file.try(:description)
+        f.no_wm = data[:no_wm].present? && data[:no_wm] != '0'
         f.file = uploaded_file
       end
 
       begin
         Rails.application.config.neofiles.before_save.try!(:call, file)
\ No newline at end of file