tweaks to new can_upload_free flag #2469

app/logical/user_promotion.rb

@@ -12,6 +12,8 @@ class UserPromotion
     validate
 
     user.level = new_level
+    user.can_approve_posts = options[:can_approve_posts]
+    user.can_upload_free = options[:can_upload_free]
     user.inviter_id = promoter.id
 
     create_transaction_log_item
@@ -55,7 +57,7 @@ private
   end
 
   def create_dmail
-    if user.level >= user.level_was
+    if user.level >= user.level_was || user.bit_prefs_changed?
       create_promotion_dmail
     else
       create_demotion_dmail
@@ -63,10 +65,22 @@ private
   end
 
   def create_promotion_dmail
+    approval_text = if user.can_approve_posts?
+      "You can approve posts."
+    else
+      ""
+    end
+
+    upload_text = if user.can_upload_free?
+      "You can upload posts without limit."
+    else
+      ""
+    end
+
     Dmail.create_split(
       :to_id => user.id,
       :title => "You have been promoted",
-      :body => "You have been promoted to a #{user.level_string} level account."
+      :body => "You have been promoted to a #{user.level_string} level account. #{approval_text} #{upload_text}"
     )
   end
 
@@ -74,7 +88,7 @@ private
     Dmail.create_split(
       :to_id => user.id,
       :title => "You have been demoted",
-      :body => "You have been demoted to a #{user.level_string} level account."
+      :body => "You have been demoted to a #{user.level_string} level account. #{approval_text} #{upload_text}"
     )
   end
 end