From 6596c90f025f155175847147202c0e6fc56a35e1 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 7 Nov 2017 18:51:59 +0630
Subject: [PATCH] turbolink fixing

---
 app/assets/javascripts/CRM.js              | 2 +-
 app/assets/javascripts/OQS.js              | 2 +-
 app/assets/javascripts/inventory.js        | 2 +-
 app/assets/javascripts/origami.js          | 2 +-
 app/views/crm/dining_queues/index.html.erb | 2 +-
 app/views/origami/home/index.html.erb      | 1 -
 app/views/origami/home/show.html.erb       | 5 ++---
 app/views/origami/surveys/new.html.erb     | 6 +++---
 8 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/CRM.js b/app/assets/javascripts/CRM.js
index 646bc195..98becbc8 100755
--- a/app/assets/javascripts/CRM.js
+++ b/app/assets/javascripts/CRM.js
@@ -22,7 +22,7 @@
 //= require bootstrap-notify/bootstrap-notify.js
 //= require node-waves/waves.js
 //= require sweetalert/sweetalert.min.js
-//= require BSBMaterial/admin.js
+//= require BSBMaterial/turbolink_admin.js
 //= require BSBMaterial/demo.js
 //= require custom.js
 
diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 4d66cfab..2f8d866d 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -20,7 +20,7 @@
 //= require jquery-slimscroll/jquery.slimscroll.js
 //= require node-waves/waves.js
 //= require sweetalert/sweetalert.min.js
-//= require BSBMaterial/admin.js
+//= require BSBMaterial/turbolink_admin.js
 //= require BSBMaterial/demo.js
 //= require custom.js
 
diff --git a/app/assets/javascripts/inventory.js b/app/assets/javascripts/inventory.js
index 3200da8a..a766ff86 100644
--- a/app/assets/javascripts/inventory.js
+++ b/app/assets/javascripts/inventory.js
@@ -7,6 +7,6 @@
 //= require jquery-slimscroll/jquery.slimscroll.js
 //= require node-waves/waves.js
 //= require sweetalert/sweetalert.min.js
-//= require BSBMaterial/admin.js
+//= require BSBMaterial/turbolink_admin.js
 //= require BSBMaterial/demo.js
 //= require custom.js
diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 84799a93..f23d13c6 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -11,7 +11,7 @@
 //= require sweetalert/sweetalert.min.js
 //= require cable
 //= require turbolinks
-//= require BSBMaterial/admin.js
+//= require BSBMaterial/turbolink_admin.js
 //= require BSBMaterial/demo.js
 //= require custom.js
 
diff --git a/app/views/crm/dining_queues/index.html.erb b/app/views/crm/dining_queues/index.html.erb
index d7ee6f06..a02cc36d 100755
--- a/app/views/crm/dining_queues/index.html.erb
+++ b/app/views/crm/dining_queues/index.html.erb
@@ -49,7 +49,7 @@
 <!-- tabs - End -->
 </div>
   <div class="col-lg-1 col-md-1 col-sm-1">
-    <%= link_to t("views.btn.new"),new_crm_dining_queue_path,:class => 'btn bg-green btn-block btn-lg btn-block' %>
+    <%= link_to t("views.btn.new"),new_crm_dining_queue_path,:class => 'btn bg-green btn-block btn-lg btn-block', 'data-no-turbolink' => true %>
     <hr>
 
     <button type="button" id="assign" class="btn btn-primary btn-block btn-lg waves-effect" disabled>Assign</button>
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 9441d654..4dd97cda 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -124,7 +124,6 @@
 <script>
 $(document).ready(function(){
   $(".tables").on('click', function(){
-    console.log("hi");
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/' + dining_id;
   });
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 52c011ce..251ff21d 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -402,10 +402,9 @@
             if (sale) {
                 var sale_id = sale
             } else {
-                var sale_id = $('.tables').attr("data-id");;
+                var sale_id = "<%= @dining.id %>";
             }
-            //var table_id = $('.tables').attr("data-id");
-
+            //var table_id = $('.tables').attr("data-id");            
             window.location.href = '/origami/' + sale_id + "/surveys"
         });
 
diff --git a/app/views/origami/surveys/new.html.erb b/app/views/origami/surveys/new.html.erb
index 8af5c071..db1f68c0 100755
--- a/app/views/origami/surveys/new.html.erb
+++ b/app/views/origami/surveys/new.html.erb
@@ -1,12 +1,12 @@
 <div class="page-header">
   <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= origami_path(1) %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= '/origami/table/@dining_facility.id' %>"><%= t("views.right_panel.button.home") %></a></li>
     <li class="breadcrumb-item active"><%= t("views.right_panel.detail.survey") %></li>
 
     <span class="float-right">
-      <%= link_to t('.back', :default => t("views.btn.back")), origami_root_path %>
+      <%= link_to t('.back',:default => t("views.btn.back")),'/origami/table/'+@dining_facility.id.to_s %>
     </span>
   </ol>
 </div>
 
- <%= render 'form', survey: @survey %>
\ No newline at end of file
+ <%= render 'form', survey: @survey %>