From df74c9e0149391c88e5ecd8ebc34644c48acdba4 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sun, 5 Jun 2016 23:06:04 +0200 Subject: [PATCH] Moved screenshot approval code into model --- app/controllers/moderate_controller.rb | 8 +------- app/models/screenshot.rb | 8 ++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/controllers/moderate_controller.rb b/app/controllers/moderate_controller.rb index a0de33c..0991573 100644 --- a/app/controllers/moderate_controller.rb +++ b/app/controllers/moderate_controller.rb @@ -27,16 +27,10 @@ class ModerateController < ApplicationController end end - # Publish a screenshot from the moderation queue def approve_screenshot @screenshot = Screenshot.find(params[:id]) - # TODO: Move code to model - @screenshot.delete_reason = nil - @screenshot.markedfordelete = false - @screenshot.approved = true - @screenshot.save! flash['notice'] = "Screenshot approved." - redirect_to package_path + redirect_to :index end end diff --git a/app/models/screenshot.rb b/app/models/screenshot.rb index f2ff7b5..7378cdd 100644 --- a/app/models/screenshot.rb +++ b/app/models/screenshot.rb @@ -83,4 +83,12 @@ class Screenshot < ActiveRecord::Base def self.unapproved self.where(approved: false) end + + # Publish a screenshot from the moderation queue + def approve_screenshot! + self.delete_reason = nil + self.markedfordelete = false + self.approved = true + self.save! + end end