diff --git a/app/models/user.rb b/app/models/user.rb index 92d7a81..22a7e20 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -35,6 +35,18 @@ class User < ActiveRecord::Base !!self.donor end + def developer? + !!self.developer + end + + def trainingmod? + !!self.trainingmod + end + + def lead_mod? + !!self.lead_mod + end + def confirmed? !!self.confirmed end @@ -61,14 +73,6 @@ class User < ActiveRecord::Base !!(self.role >= :normal) end - def trainingmod? - !!(self.role >= :trainingmod) - end - - def developer? - !!(self.role >= :developer) - end - def mod? !!(self.role >= :mod) end diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index b2d1bd5..8d24076 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -40,6 +40,26 @@ <% end %> + <% if admin? %> + + Developer + + <%= f.select :developer, [["No", false], ["Yes", true]], {}, { disabled: !can_edit? } %> + + + + TrainingMod + + <%= f.select :trainingmod, [["No", false], ["Yes", true]], {}, { disabled: !can_edit? } %> + + + + Lead Mod + + <%= f.select :lead_mod, [["No", false], ["Yes", true]], {}, { disabled: !can_edit? } %> + + + <% end %> Skype username diff --git a/db/seeds.rb b/db/seeds.rb index 833a176..780ddb5 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,8 +5,6 @@ Role.create!([ {name: "disabled", value: 1, color: "#ccc"}, {name: "banned", value: 2, color: "#ccc"}, {name: "normal", value: 10, color: "#282"}, - {name: "trainingmod", value: 40, color: "#fa5"}, - {name: "developer", value: 70, color: "#a0a"}, {name: "mod", value: 100, color: "#6af"}, {name: "admin", value: 200, color: "#d22"}, {name: "superadmin", value: 500, color: "#d22"}