diff --git a/app/admin/role.rb b/app/admin/role.rb index dc386de..378fe2d 100644 --- a/app/admin/role.rb +++ b/app/admin/role.rb @@ -5,7 +5,7 @@ # [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register Role do - permit_params :name, :role_in_plans + permit_params :name menu :priority => 5, :label => proc{I18n.t('admin.role')}, :parent => "User management" @@ -21,7 +21,6 @@ show do attributes_table do row :name - row :role_in_plans row :created_at row :updated_at end @@ -48,7 +47,6 @@ form do |f| f.inputs "Details" do f.input :name - f.input :role_in_plans end f.actions diff --git a/app/models/role.rb b/app/models/role.rb index dbe0a80..47b3959 100644 --- a/app/models/role.rb +++ b/app/models/role.rb @@ -1,8 +1,6 @@ class Role < ActiveRecord::Base has_and_belongs_to_many :users, :join_table => :users_roles - belongs_to :resource, :polymorphic => true - - attr_accessible :name, :role_in_plans, :resource_id, :resource_type, :as => [:default, :admin] + attr_accessible :name, :as => [:default, :admin] end diff --git a/db/migrate/20161115123658_remove_unused_fields_from_roles.rb b/db/migrate/20161115123658_remove_unused_fields_from_roles.rb new file mode 100644 index 0000000..0f768cc --- /dev/null +++ b/db/migrate/20161115123658_remove_unused_fields_from_roles.rb @@ -0,0 +1,7 @@ +class RemoveUnusedFieldsFromRoles < ActiveRecord::Migration + def change + remove_column :roles, :role_in_plans, :boolean + remove_column :roles, :resource_id, :integer + remove_column :roles, :resource_type, :string + end +end