diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 84f6f28..95545d8 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -5,7 +5,7 @@ class ApplicationController < ActionController::Base def check_enabled - if !(!@current_customer and current_admin and params[:admin]) or (@current_customer and !@current_customer.account_validated?) + if (!@current_customer and current_admin and params[:admin]) or (@current_customer and !@current_customer.account_validated?) redirect_to public_my_account_path end end diff --git a/app/controllers/public/documents_controller.rb b/app/controllers/public/documents_controller.rb index dc59024..256c293 100644 --- a/app/controllers/public/documents_controller.rb +++ b/app/controllers/public/documents_controller.rb @@ -65,9 +65,6 @@ class Public::DocumentsController < ApplicationController ::POSIX::Spawn::Child.new 'pdftk', "A="+@document.document.file.path, 'B='+@final_file ,"cat", "B1", "A2-end", 'output', @final_file2 - #pdftk A=/Users/nico/Dev/negos_app/pdf_stamp/contrat.pdf B=/Users/nico/Dev/negos_app/pdf/documents/3.pdf cat B1 A2-end output fichier-final.pdf - - @data_to_send = File.open( @final_file2).read send_data @data_to_send, :filename =>"negos-document-#{@document.id}.pdf" , :type => 'application/pdf',:disposition => (params[:inline] ? 'inline' : "attachment")