app/models/adminpanel/user.rb in adminpanel-2.1.7 vs app/models/adminpanel/user.rb in adminpanel-2.2.0

- old
+ new

@@ -1,13 +1,13 @@ module Adminpanel class User < ActiveRecord::Base include Adminpanel::Base has_secure_password - belongs_to :group + belongs_to :rol - #group validation - validates_presence_of :group_id + #rol validation + validates_presence_of :rol_id #name validations validates_presence_of :name validates_length_of :name, :maximum => 25 @@ -63,15 +63,15 @@ 'label' => I18n.t('model.attributes.password_confirmation'), 'show' => 'false' } }, { - 'group_id' => { + 'rol_id' => { 'type' => 'belongs_to', - 'model' => 'Adminpanel::Group', - 'remote_resource' => false, - 'placeholder' => I18n.t('model.attributes.group_id'), - 'label' => I18n.t('model.attributes.group_id') + 'model' => 'Adminpanel::Rol', + # 'remote_resource' => false, + 'placeholder' => I18n.t('model.attributes.rol_id'), + 'label' => I18n.t('model.attributes.rol_id') } }, ] end