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

merge with master

Browse Source
This commit is contained in:
Yan
2017-09-13 14:46:51 +06:30
parent 89e6a7161a 4b732e8d8c
commit 807d472c01
5 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/api/restaurant/menu/_menu_item.json.jbuilder
View File

@@ -92,9 +92,10 @@ json.options opt_format
json.instances item.menu_item_instances do |is|
# Convert id to name for attributes
instance_attr = []
is.item_attributes do |ia|
mItemAttr = MenuItemAttribute.find(ia)
instance_attr.push(mItemAttr.name)
is.item_attributes.each do |ia|
# mItemAttr = MenuItemAttribute.find(is)
instance_attr.push(ia)
end
json.id is.id

23
app/views/settings/menu_item_instances/edit.html.erb
View File

@@ -12,5 +12,26 @@
</ul>
</div>
<%= render 'form', settings_menu_item_menu_item_instances: @settings_menu_item_instances, item_sets: @item_sets %>
</div>
<script type="text/javascript">
$(function(){
// auto selected after loaded
<%
@settings_menu_item_instances.item_sets.each do |set|
%>
$("#menu_item_instance_item_sets option[value='" + <%= set.id %> + "']").attr("selected","selected").css({'color':'#fff','background':'#215d9c'});
<%
end
%>
// After loaded
$("#menu_item_instance_item_sets").on('click', 'option', function(e){
if($(this).attr("selected")){
$(this).removeAttr("selected");
$(this).css({'color':'#000','background':'#fff'});
}
});
});
</script>