Update bundle

[rails.git] / app / models / changeset.rb

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index cede7daa1438777cfb868b5ba608631c43771b59..691081609adda915afb0685fef994bc030709818 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -120,10 +120,6 @@ class Changeset < ActiveRecord::Base
     self.num_changes += elements
   end
 
     self.num_changes += elements
   end
 

-  def tags_as_hash
-    tags
-  end
-

   def tags
     unless @tags
       @tags = {}
   def tags
     unless @tags
       @tags = {}


@@ -150,7 +146,7 @@ class Changeset < ActiveRecord::Base
     # do the changeset update and the changeset tags update in the
     # same transaction to ensure consistency.
     Changeset.transaction do
     # do the changeset update and the changeset tags update in the
     # same transaction to ensure consistency.
     Changeset.transaction do

-      self.save!
+      save!

 
       tags = self.tags
       ChangesetTag.delete_all(:changeset_id => id)
 
       tags = self.tags
       ChangesetTag.delete_all(:changeset_id => id)


@@ -170,12 +166,12 @@ class Changeset < ActiveRecord::Base
   # that would make it more than 24h long, in which case clip to
   # 24h, as this has been decided is a reasonable time limit.
   def update_closed_at
   # that would make it more than 24h long, in which case clip to
   # 24h, as this has been decided is a reasonable time limit.
   def update_closed_at

-    if self.is_open?
-      if (closed_at - created_at) > (MAX_TIME_OPEN - IDLE_TIMEOUT)
-        self.closed_at = created_at + MAX_TIME_OPEN
-      else
-        self.closed_at = Time.now.getutc + IDLE_TIMEOUT
-      end
+    if is_open?
+      self.closed_at = if (closed_at - created_at) > (MAX_TIME_OPEN - IDLE_TIMEOUT)
+                         created_at + MAX_TIME_OPEN
+                       else
+                         Time.now.getutc + IDLE_TIMEOUT
+                       end

     end
   end
 
     end
   end