fixed conflict

This commit is contained in:
Nweni
2017-06-04 10:23:38 +06:30
18 changed files with 163 additions and 121 deletions

View File

@@ -1,4 +1,6 @@
class MenuItemAttribute < ApplicationRecord
validates_presence_of :attribute_type, :name, :value
def self.collection
MenuItemAttribute.select("id, name").map { |e| [e.name, e.id] }
end
end