From 19a5ce81a5453e59e6e2226e53cabaa7055b32a9 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sun, 23 Nov 2014 19:55:43 +0100 Subject: [PATCH] Recoverd methods for Screenshot model --- app/models/screenshot.rb | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/app/models/screenshot.rb b/app/models/screenshot.rb index 2d248f3..5e29490 100644 --- a/app/models/screenshot.rb +++ b/app/models/screenshot.rb @@ -9,26 +9,26 @@ class Screenshot < ActiveRecord::Base "#{Rails.configuration.images_path_prefix}/#{self.package.name[0]}/#{self.package.name}/#{self.id}_#{size}.png" end - ## Get the URL leading to a screenshot of this package - #def url(size) - # if self.approved - # # TODO: Make the path configurable - # basepath = "/screenshots/approved/" - # else - # basepath = "/screenshots/unapproved/" - # end - # - # File.join(basepath, self.package.name[0], self.package.name, "#{self.id}_#{size}.png") - #end - # - ## Return caption for full-screen screenshots. - ## Takes the description of a screenshot if available. - ## Otherwise it falls back to the general description of its package. - #def caption - # if self.description != '' - # self.description - # else - # self.package.description - # end - #end + # Get the URL leading to a screenshot of this package + def url(size) + if self.approved + # TODO: Make the path configurable + basepath = "/screenshots/approved/" + else + basepath = "/screenshots/unapproved/" + end + + File.join(basepath, self.package.name[0], self.package.name, "#{self.id}_#{size}.png") + end + + # Return caption for full-screen screenshots. + # Takes the description of a screenshot if available. + # Otherwise it falls back to the general description of its package. + def caption + if self.description != '' + self.description + else + self.package.description + end + end end