git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

turbolink fixing

Browse Source
This commit is contained in:
Yan
2017-11-07 18:51:59 +06:30
parent 8aa834a487
commit 6596c90f02
8 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/CRM.js
View File

@@ -22,7 +22,7 @@
//= require bootstrap-notify/bootstrap-notify.js //= require bootstrap-notify/bootstrap-notify.js
//= require node-waves/waves.js //= require node-waves/waves.js
//= require sweetalert/sweetalert.min.js //= require sweetalert/sweetalert.min.js
//= require BSBMaterial/admin.js //= require BSBMaterial/turbolink_admin.js
//= require BSBMaterial/demo.js //= require BSBMaterial/demo.js
//= require custom.js //= require custom.js

2
app/assets/javascripts/OQS.js
View File

@@ -20,7 +20,7 @@
//= require jquery-slimscroll/jquery.slimscroll.js //= require jquery-slimscroll/jquery.slimscroll.js
//= require node-waves/waves.js //= require node-waves/waves.js
//= require sweetalert/sweetalert.min.js //= require sweetalert/sweetalert.min.js
//= require BSBMaterial/admin.js //= require BSBMaterial/turbolink_admin.js
//= require BSBMaterial/demo.js //= require BSBMaterial/demo.js
//= require custom.js //= require custom.js

2
app/assets/javascripts/inventory.js
View File

@@ -7,6 +7,6 @@
//= require jquery-slimscroll/jquery.slimscroll.js //= require jquery-slimscroll/jquery.slimscroll.js
//= require node-waves/waves.js //= require node-waves/waves.js
//= require sweetalert/sweetalert.min.js //= require sweetalert/sweetalert.min.js
//= require BSBMaterial/admin.js //= require BSBMaterial/turbolink_admin.js
//= require BSBMaterial/demo.js //= require BSBMaterial/demo.js
//= require custom.js //= require custom.js

2
app/assets/javascripts/origami.js
View File

@@ -11,7 +11,7 @@
//= require sweetalert/sweetalert.min.js //= require sweetalert/sweetalert.min.js
//= require cable //= require cable
//= require turbolinks //= require turbolinks
//= require BSBMaterial/admin.js //= require BSBMaterial/turbolink_admin.js
//= require BSBMaterial/demo.js //= require BSBMaterial/demo.js
//= require custom.js //= require custom.js

2
app/views/crm/dining_queues/index.html.erb
View File

@@ -49,7 +49,7 @@
<!-- tabs - End --> <!-- tabs - End -->
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1"> <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> <hr>
<button type="button" id="assign" class="btn btn-primary btn-block btn-lg waves-effect" disabled>Assign</button> <button type="button" id="assign" class="btn btn-primary btn-block btn-lg waves-effect" disabled>Assign</button>

1
app/views/origami/home/index.html.erb
View File

@@ -124,7 +124,6 @@
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
$(".tables").on('click', function(){ $(".tables").on('click', function(){
console.log("hi");
var dining_id = $(this).attr("data-id"); var dining_id = $(this).attr("data-id");
window.location.href = '/origami/table/' + dining_id; window.location.href = '/origami/table/' + dining_id;
}); });

3
app/views/origami/home/show.html.erb
View File

@@ -402,10 +402,9 @@
if (sale) { if (sale) {
var sale_id = sale var sale_id = sale
} else { } 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" window.location.href = '/origami/' + sale_id + "/surveys"
}); });

4
app/views/origami/surveys/new.html.erb
View File

@@ -1,10 +1,10 @@
<div class="page-header"> <div class="page-header">
<ol class="breadcrumb"> <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> <li class="breadcrumb-item active"><%= t("views.right_panel.detail.survey") %></li>
<span class="float-right"> <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> </span>
</ol> </ol>
</div> </div>