For super admin, trying update read destroy instead of manage machine…

…conditions
scottwainstock · Mar 21, 2021 · eaf9f5f · eaf9f5f
1 parent 3d43466
commit eaf9f5f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/models/ability.rb b/app/models/ability.rb
@@ -13,7 +13,8 @@ def initialize(user)
     can %i[update read destroy], [MachineScoreXref], location: { region_id: user.region_id }
 
     if user.is_super_admin
-      can :manage, [Operator, Location, User, UserSubmission, SuggestedLocation, MachineCondition, LocationPictureXref]
+      can :manage, [Operator, Location, User, UserSubmission, SuggestedLocation, LocationPictureXref]
+      can %i[update read destroy], [MachineCondition]
     else
       can :manage, [Location, Operator], region_id: user.region_id
       can %i[update read destroy], [SuggestedLocation], region_id: user.region_id

diff --git a/config/initializers/rails_admin.rb b/config/initializers/rails_admin.rb
@@ -619,7 +619,7 @@ def fetch_action_and_subject(action, abstract_model, model_object)
   config.model MachineCondition do
     list do
       field :id, :integer
-      field :comment, :string
+      field :comment
       field :user do
         searchable :username
       end
@@ -635,7 +635,7 @@ def fetch_action_and_subject(action, abstract_model, model_object)
     end
     show do
       field :id, :integer
-      field :comment, :string
+      field :comment
       field :user do
         searchable :username
       end
@@ -650,7 +650,7 @@ def fetch_action_and_subject(action, abstract_model, model_object)
       field :updated_at, :date
     end
     edit do
-      field :comment, :text
+      field :comment
       field :user do
         read_only true
       end