diff --git a/app/admin/token_permission_type.rb b/app/admin/token_permission_type.rb index cd6e05c..5c804e8 100644 --- a/app/admin/token_permission_type.rb +++ b/app/admin/token_permission_type.rb @@ -1,5 +1,5 @@ ActiveAdmin.register TokenPermissionType do - permit_params :token_type, :text_desription + permit_params :token_type, :text_description menu priority: 40, label: proc{ I18n.t('admin.token_permission_type')}, parent: "Api" @@ -11,7 +11,7 @@ link_to n.token_type, [:admin, n] end column I18n.t('admin.permission_description') do |n| - link_to n.text_desription, [:admin, n] + link_to n.text_description, [:admin, n] end actions @@ -20,7 +20,7 @@ show do attributes_table do row :token_type - row :text_desription + row :text_description end end diff --git a/app/models/token_permission_type.rb b/app/models/token_permission_type.rb index 4aa16e1..8d368b6 100644 --- a/app/models/token_permission_type.rb +++ b/app/models/token_permission_type.rb @@ -1,6 +1,6 @@ class TokenPermissionType < ActiveRecord::Base - attr_accessible :token_type, :text_desription, :as => [:default, :admin] + attr_accessible :token_type, :text_description, :as => [:default, :admin] #associations between tables #has_and_belongs_to_many :org_token_permissions, join_table: "org_token_permissions" diff --git a/app/views/token_permission_types/index.html.erb b/app/views/token_permission_types/index.html.erb index 0f7e8bd..7215979 100644 --- a/app/views/token_permission_types/index.html.erb +++ b/app/views/token_permission_types/index.html.erb @@ -7,7 +7,7 @@
- <%= token_type.text_desription %> + <%= token_type.text_description %>
diff --git a/db/migrate/20161102221313_change_text_description_to_text_description_in_token_permission_types.rb b/db/migrate/20161102221313_change_text_description_to_text_description_in_token_permission_types.rb new file mode 100644 index 0000000..13de837 --- /dev/null +++ b/db/migrate/20161102221313_change_text_description_to_text_description_in_token_permission_types.rb @@ -0,0 +1,7 @@ +class ChangeTextDescriptionToTextDescriptionInTokenPermissionTypes < ActiveRecord::Migration + def change + if column_exists?(:token_permission_types, :text_desription) + rename_column :token_permission_types, :text_desription, :text_description + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 0a1749f..3ff9498 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20161021100420) do +ActiveRecord::Schema.define(version: 20161102221313) do create_table "answers", force: :cascade do |t| t.text "text" diff --git a/db/seeds.rb b/db/seeds.rb index 3be10f2..01cb61f 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -774,7 +774,7 @@ if TokenPermissionType.where(token_type: title).empty? token_permission_type = TokenPermissionType.new token_permission_type.token_type = title - token_permission_type.text_desription = settings[:description] + token_permission_type.text_description = settings[:description] token_permission_type.save! end end diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake index 58be722..87bbe10 100644 --- a/lib/tasks/migrate.rake +++ b/lib/tasks/migrate.rake @@ -71,7 +71,7 @@ if TokenPermissionType.where(token_type: title).empty? token_permission_type = TokenPermissionType.new token_permission_type.token_type = title - token_permission_type.text_desription = settings[:description] + token_permission_type.text_description = settings[:description] token_permission_type.save! end end