Changeset 328

Timestamp:

12/08/06 17:42:33 (2 years ago)

Author:

jarmo

Message:

• Closes #175
  

Files:

• trunk/app/controllers/report_controller.rb (modified) (1 diff)
• trunk/app/models/report.rb (modified) (3 diffs)

trunk/app/controllers/report_controller.rb

@@ -157 +157 @@
-        @report.editable = params[:report][:editable] if params[:report] and @report.report_type.editable
-        session[:image_fields].delete(@report_cookie) if session[:image_fields]
-
-
-
-
-
+
-          flash[:notice] = msg_changes_saved
-          redirect_to :action => 'view', :id => @report.id and return

trunk/app/models/report.rb

@@ -8 +8 @@
-  # Callbacks
-  after_create :created_event
-  after_update :modified_event
-  # Associations
-  belongs_to :report_type
@@ -93 +92 @@
-  end
-
+  # Saves the report and all associated field values. Timeline event is created after saving.
+  def save_with_values
+    begin
+      Report.transaction do
+        self.save!
+        for value in self.report_field_values
+          value.save!
+        end     
+        ReportEvent.create!(:event_type => ReportEvent.TYPES[:MODIFIED], :report => self)
+      end
+    rescue
+      return false
+    end
+    return true
+  end
+
-  # Returns true if this report is editable and the current user is authorized to edit this report.
-  def editable_by_current_user?
@@ -162 +177 @@
-                       :report => self)
-  end
-
-  def modified_event
-    ReportEvent.create(:event_type => ReportEvent.TYPES[:MODIFIED],
-                       :report => self)
-  end
-end
-