From 09594f83f22bec4db4dfc5d999ae85c48074d3d5 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 5 Apr 2018 16:08:20 +0630 Subject: [PATCH] print setting for jade print --- app/assets/javascripts/OQS.js | 3 +- app/controllers/print_settings_controller.rb | 2 + app/views/layouts/login_dashboard.html.erb | 4 +- app/views/print_settings/_form.html.erb | 54 +++++++++++++++----- config/secrets.yml | 2 +- 5 files changed, 46 insertions(+), 19 deletions(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index 2bbf07bb..1409c829 100755 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -93,8 +93,7 @@ $(document).on('turbolinks:load', function() { var oqs_append = $('.oqs_append'); oqs_append.empty(); var filter = $('.filter').text(); - - console.log(table_id) + //Start Ajax $.ajax({ type: "GET", diff --git a/app/controllers/print_settings_controller.rb b/app/controllers/print_settings_controller.rb index f12778af..991f4ad2 100755 --- a/app/controllers/print_settings_controller.rb +++ b/app/controllers/print_settings_controller.rb @@ -18,10 +18,12 @@ class PrintSettingsController < ApplicationController # GET /print_settings/new def new @print_setting = PrintSetting.new + @server_mode = ENV["SERVER_MODE"] end # GET /print_settings/1/edit def edit + @server_mode = ENV["SERVER_MODE"] end # POST /print_settings diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb index d3e4729d..329e9240 100755 --- a/app/views/layouts/login_dashboard.html.erb +++ b/app/views/layouts/login_dashboard.html.erb @@ -11,8 +11,8 @@ - - + <%= stylesheet_link_tag 'login', media: 'all', 'data-turbolinks-track': 'reload' %> diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb index bec1b931..18ed2ab3 100755 --- a/app/views/print_settings/_form.html.erb +++ b/app/views/print_settings/_form.html.erb @@ -1,4 +1,3 @@ -
@@ -11,7 +10,16 @@ <%= f.input :unique_code %> <%= f.input :template %> <%= f.input :font %> - <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %> + <% + if(@server_mode != 'cloud') + %> + <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %> + <% + else + %> + <%= f.input :printer_name, :as => :select, :collection => [], include_blank: false %> + <% end %> + <%= f.input :brand_name %> <%= f.input :printer_type %> <%= f.input :api_settings %> @@ -64,20 +72,38 @@