pull from master

This commit is contained in:
San Wai Lwin
2018-06-18 16:14:59 +06:30
parent 25a8381681
commit 234c00f105
27 changed files with 810 additions and 547 deletions

View File

@@ -1,7 +1,7 @@
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
<%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %>
<%= simple_form_for([:settings,@category, @settings_menu_item],:html => {:onsubmit=>"return validateForm()"}) do |f| %>
<%= f.error_notification %>
<div class="card">
<div class="row">
@@ -92,4 +92,22 @@
</div>
</div>
<script>
function validateForm() {
var x = $(".item_attributes").val();
if (x == null) {
swal({
title: "Opps!",
text: "Item attributes must be filled out",
type: 'error',
html: true,
closeOnConfirm: false,
closeOnCancel: false,
allowOutsideClick: false
}, function () {
location.reload();
});
return false;
}
}
</script>