Adding support for re-opening merge requests.

This is an explicit action, wrapped inside a
separate method in MergeRequest which passes along
the user who wants to re-open. 
- Also added a new Action and rendering of the events

1 files changed, 14 insertions, 0 deletions

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index dab8dad..bc6a16b 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -68,6 +68,10 @@ class MergeRequest < ActiveRecord::Base
     event :merge do
       transition [:open, :verifying] => :merged
     end
+    
+    event :reopen do
+      transition [:merged, :rejected] => :open
+    end
   end
   
   named_scope :open, :conditions => ['status in (?)', [STATUS_OPEN, STATUS_VERIFYING]]
@@ -75,6 +79,16 @@ class MergeRequest < ActiveRecord::Base
   named_scope :merged, :conditions => ["status = ?", [STATUS_MERGED]]
   named_scope :rejected, :conditions => ["status = ?", [STATUS_REJECTED]]
   
+  def reopen_with_user(a_user)
+    if can_be_reopened_by?(a_user)
+      return reopen
+    end
+  end
+  
+  def can_be_reopened_by?(a_user)
+    return can_reopen? && resolvable_by?(a_user)
+  end
+  
   def self.human_name
     I18n.t("activerecord.models.merge_request")
   end