diff --git a/app/controllers/moderator/invitations_controller.rb b/app/controllers/moderator/invitations_controller.rb deleted file mode 100644 index e76af41d5..000000000 --- a/app/controllers/moderator/invitations_controller.rb +++ /dev/null @@ -1,17 +0,0 @@ -module Moderator - class InvitationsController < ApplicationController - before_action :moderator_only - - def new - end - - def create - User.find(params[:invitation][:user_id]).invite!(params[:invitation][:level], params[:invitation][:can_upload_free]) - redirect_to moderator_invitations_path - end - - def index - @users = User.where("inviter_id = ?", CurrentUser.id).paginate(params[:page]) - end - end -end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 6511eb377..909258809 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -150,7 +150,7 @@ module ApplicationHelper html << " [" + link_to("+", new_user_feedback_path(:user_feedback => {:category => "positive", :user_id => user.id})) + "]" unless user.is_gold? - html << " [" + link_to("invite", new_moderator_invitation_path(:invitation => {:name => user.name, :can_upload_free => "1"})) + "]" + html << " [" + link_to("promote", edit_admin_user_path(user)) + "]" end else html << " [" + link_to("–".html_safe, new_user_feedback_path(:user_feedback => {:category => "negative", :user_id => user.id})) + "]" diff --git a/app/helpers/moderator/invitations_helper.rb b/app/helpers/moderator/invitations_helper.rb deleted file mode 100644 index 14f1cd60a..000000000 --- a/app/helpers/moderator/invitations_helper.rb +++ /dev/null @@ -1,10 +0,0 @@ -module Moderator - module InvitationsHelper - def level_select - choices = [] - choices << ["Gold", User::Levels::GOLD] - choices << ["Platinum", User::Levels::PLATINUM] - select(:invitation, :level, choices) - end - end -end diff --git a/app/models/user.rb b/app/models/user.rb index 1a7117d16..f0cefa6c6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -135,22 +135,6 @@ class User < ApplicationRecord end end - module InvitationMethods - def invite!(level, can_upload_free) - if can_upload_free - self.can_upload_free = true - else - self.can_upload_free = false - end - - if level.to_i <= Levels::BUILDER - self.level = level - self.inviter_id = CurrentUser.id - save - end - end - end - module NameMethods extend ActiveSupport::Concern @@ -909,7 +893,6 @@ class User < ApplicationRecord include BlacklistMethods include ForumMethods include LimitMethods - include InvitationMethods include ApiMethods include CountMethods extend SearchMethods diff --git a/app/views/moderator/invitations/index.html.erb b/app/views/moderator/invitations/index.html.erb deleted file mode 100644 index abb81f54c..000000000 --- a/app/views/moderator/invitations/index.html.erb +++ /dev/null @@ -1,17 +0,0 @@ -