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

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

@@ -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;
});

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

@@ -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"
});

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

@@ -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 %>
<%= render 'form', survey: @survey %>