From 7914d09676c019622be2a11592baf006e9b230fe Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Wed, 22 Jun 2016 18:09:41 +0200 Subject: [PATCH] Dealing with empty/nil version/description fields properly. --- app/views/packages/details.slim | 13 ++++++++++--- .../set_empty_screenshot_version_to_zero.rake | 16 ---------------- 2 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 lib/tasks/set_empty_screenshot_version_to_zero.rake diff --git a/app/views/packages/details.slim b/app/views/packages/details.slim index 758becc..452fb42 100644 --- a/app/views/packages/details.slim +++ b/app/views/packages/details.slim @@ -11,7 +11,11 @@ .text-center a.black.fancybox href=screenshot.image.url(:large, timestamp: false) rel='fancybox-thumb' title=screenshot.caption = image_tag(screenshot.image.url(:large, timestamp: false), alt: screenshot.caption) - .imgcaption =screenshot.caption + - if screenshot.description + .imgcaption =screenshot.description + - if screenshot.version.present? + em.imgcaption + '(from version #{screenshot.version}) - if user_signed_in? em.imgcaption =screenshot.adminstatus @@ -36,15 +40,18 @@ .bigpanel p.subtitle Description // TODO: split long_description by

tags - - if @package.long_description + - if @package.long_description.present? p =@package.long_description - else p Sorry - no more information available. - - if @package.homepage + - if @package.homepage.present? hr p.subtitle Homepage p = link_to @package.homepage, @package.homepage, target: '_blank' + / hr + / p.subtitle Newest known version + / p =@package.version a.button.round.expand data-open="upload-modal" Upload more screenshots for #{@package.name} diff --git a/lib/tasks/set_empty_screenshot_version_to_zero.rake b/lib/tasks/set_empty_screenshot_version_to_zero.rake deleted file mode 100644 index de3002e..0000000 --- a/lib/tasks/set_empty_screenshot_version_to_zero.rake +++ /dev/null @@ -1,16 +0,0 @@ -namespace :debshots do - desc "Screenshots with empty version strings get a version of '0'" - - task :set_empty_screenshot_version_to_zero => :environment do - Rails.logger = Logger.new(STDOUT) - Rails.logger.level = Logger::INFO - #Rails.logger.level = Logger::DEBUG - - # Screenshot.where(version: '').map(&:package).map(&:name) - - Screenshot.where(version: '').each do |s| - s.version = '0' - s.save! - end - end -end