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

fix oqs css and oqs edit turbolink control

Browse Source
This commit is contained in:
Yan
2017-11-17 16:31:03 +06:30
parent 6c03d0249c
commit 11f040b142
5 changed files with 210 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,9 @@
//= require custom.js
$(document).on('turbolinks:load', function() {
$('#back').on('click', function () {
window.location.href = '/oqs/';
});
$(".nav-completed").on("click", function(){
$("#completed").removeClass('hide')
@@ -96,7 +99,7 @@ $(document).on('turbolinks:load', function() {
+'</div>'
+'<div class="card-footer">'
+'<button id="edit_'+ data[field]["assigned_order_item_id"]+'" class="btn btn-warning order-item order-item-edit">EDIT</button>'
+'<button id="edit_'+ data[field]["assigned_order_item_id"] + '" data-no-turbolink="true" class="btn btn-warning order-item order-item-edit">EDIT</button>'
+' <button id="assigned_queue_' + data[field]["assigned_order_item_id"] +'" class="btn btn-primary order-item order-complete">COMPLETE</button>'
+'</div>'