diff --git a/app/models/screenshot.rb b/app/models/screenshot.rb index 2dd5b92..c7b6262 100644 --- a/app/models/screenshot.rb +++ b/app/models/screenshot.rb @@ -2,7 +2,7 @@ class Screenshot < ActiveRecord::Base belongs_to :package, :inverse_of=>:screenshots default_scope { - order('uploaddatetime DESC') + order('created_at DESC') } has_attached_file :image, @@ -29,7 +29,11 @@ class Screenshot < ActiveRecord::Base # Calculate how many days ago this screenshot has been uploaded def age_days - seconds = Time.now-self.uploaddatetime + if self.created_at + seconds = Time.now - self.created_at + else + seconds = 0 + end days = (seconds/86400).to_i days ? "#{days} days ago" : 'today' end diff --git a/app/views/packages/details.slim b/app/views/packages/details.slim index 6caf728..201e405 100644 --- a/app/views/packages/details.slim +++ b/app/views/packages/details.slim @@ -25,7 +25,7 @@ ] Delete screenshot p Uploader IP=#{screenshot.uploaderip} - p Uploaded #{screenshot.age_days} (#{screenshot.uploaddatetime}) + p Uploaded #{screenshot.age_days} (#{screenshot.created_at}) p Status: #{screenshot.status} - else diff --git a/db/migrate/20160304140037_rename_uploaddatetime.rb b/db/migrate/20160304140037_rename_uploaddatetime.rb new file mode 100644 index 0000000..563a827 --- /dev/null +++ b/db/migrate/20160304140037_rename_uploaddatetime.rb @@ -0,0 +1,6 @@ +class RenameUploaddatetime < ActiveRecord::Migration + def change + remove_column :screenshots, :created_at + rename_column :screenshots, :uploaddatetime, :created_at + end +end diff --git a/db/schema.rb b/db/schema.rb index 62116f6..8f2b801 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160302135740) do +ActiveRecord::Schema.define(version: 20160304140037) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -45,14 +45,13 @@ ActiveRecord::Schema.define(version: 20160302135740) do create_table "screenshots", force: :cascade do |t| t.integer "package_id" t.string "version", limit: 50 - t.datetime "uploaddatetime" + t.datetime "created_at" t.string "uploaderhash", limit: 72 t.string "uploaderip", limit: 15 t.boolean "approved" t.boolean "markedfordelete" t.string "delete_reason", limit: 100 t.string "description", limit: 40 - t.datetime "created_at" t.datetime "updated_at" t.string "image_file_name" t.string "image_content_type" diff --git a/lib/tasks/remove_image_duplicates.rake b/lib/tasks/remove_image_duplicates.rake index b611c53..5e27580 100644 --- a/lib/tasks/remove_image_duplicates.rake +++ b/lib/tasks/remove_image_duplicates.rake @@ -17,7 +17,7 @@ namespace :debshots do loop do destroyed = 0 - Screenshot.select(:package_id, :image_fingerprint).group(:package_id, :image_fingerprint, :uploaddatetime).having("count(*) > 1").each do |ss| + Screenshot.select(:package_id, :image_fingerprint).group(:package_id, :image_fingerprint, :created_at).having("count(*) > 1").each do |ss| # Look again for screenshots of this fingerprint. # This extra step may seem stupid but the above query lead to package_id=NULL results sometimes. del = Screenshot.find_by(image_fingerprint: ss.image_fingerprint) diff --git a/test/fixtures/screenshots.yml b/test/fixtures/screenshots.yml index b6e965a..2dd0d92 100644 --- a/test/fixtures/screenshots.yml +++ b/test/fixtures/screenshots.yml @@ -2,20 +2,20 @@ # one: # version: MyString -# uploaddatetime: 2013-07-27 13:29:55 +# created_at: 2013-07-27 13:29:55 # uploaderhash: MyString # uploaderip: MyString -# approved: -# markedfordelete: +# approved: +# markedfordelete: # delete_reason: MyString # description: MyString # two: # version: MyString -# uploaddatetime: 2013-07-27 13:29:55 +# created_at: 2013-07-27 13:29:55 # uploaderhash: MyString # uploaderip: MyString -# approved: -# markedfordelete: +# approved: +# markedfordelete: # delete_reason: MyString # description: MyString