From 89a59b1b01c07cf041ce192c9489e63ecf9e968a Mon Sep 17 00:00:00 2001 From: r888888888 Date: Mon, 10 Mar 2014 17:16:50 -0700 Subject: [PATCH] fix bug with user promotions --- app/logical/user_promotion.rb | 3 ++- app/models/post.rb | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/logical/user_promotion.rb b/app/logical/user_promotion.rb index d6a2d0e83..a8544c47b 100644 --- a/app/logical/user_promotion.rb +++ b/app/logical/user_promotion.rb @@ -8,10 +8,11 @@ class UserPromotion end def promote! + validate + user.level = new_level user.inviter_id = promoter.id - validate create_transaction_log_item create_user_feedback create_dmail diff --git a/app/models/post.rb b/app/models/post.rb index 34f1f856d..c610e7a3b 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -42,20 +42,20 @@ class Post < ActiveRecord::Base module FileMethods def distribute_files RemoteFileManager.new(file_path).distribute - RemoteFileManager.new(real_preview_file_path).distribute if is_image? + RemoteFileManager.new(preview_file_path).distribute if is_image? RemoteFileManager.new(large_file_path).distribute if has_large? end def delete_remote_files RemoteFileManager.new(file_path).delete - RemoteFileManager.new(real_preview_file_path).delete if is_image? + RemoteFileManager.new(preview_file_path).delete if is_image? RemoteFileManager.new(large_file_path).delete if has_large? end def delete_files FileUtils.rm_f(file_path) FileUtils.rm_f(large_file_path) - FileUtils.rm_f(real_preview_file_path) + FileUtils.rm_f(preview_file_path) end def file_path_prefix