From ac44bd70d3a883dcbca21fcba80b160ab7977e49 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Tue, 23 Sep 2014 07:37:43 +0200
Subject: [PATCH] Improved performance of ticket update.

---
 .../app/controllers/ticket_zoom.js.coffee     | 18 +---
 app/controllers/tickets_controller.rb         | 86 +++++++++++--------
 2 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
index f1c7ab297..a8e3c9d6a 100644
--- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
@@ -576,26 +576,14 @@ class Edit extends App.Controller
         @autosaveStart()
         return
 
+    ticket.article = article
     ticket.save(
       done: (r) =>
 
         # reset form after save
-        if article
-          article.save(
-            done: (r) =>
-              @ui.fetch( ticket.id, true )
+        App.TaskManager.update( @task_key, { 'state': {} })
 
-              # reset form after save
-              App.TaskManager.update( @task_key, { 'state': {} })
-            fail: (r) =>
-              @log 'error', 'update article', r
-          )
-        else
-
-          # reset form after save
-          App.TaskManager.update( @task_key, { 'state': {} })
-
-          @ui.fetch( ticket.id, true )
+        @ui.fetch( ticket.id, true )
     )
 
   reset: (e) =>
diff --git a/app/controllers/tickets_controller.rb b/app/controllers/tickets_controller.rb
index 06a3a4911..12a5654b2 100644
--- a/app/controllers/tickets_controller.rb
+++ b/app/controllers/tickets_controller.rb
@@ -22,7 +22,7 @@ class TicketsController < ApplicationController
 
   # POST /api/v1/tickets
   def create
-    @ticket = Ticket.new( Ticket.param_validation( params[:ticket] ) )
+    ticket = Ticket.new( Ticket.param_validation( params[:ticket] ) )
 
     # check if article is given
     if !params[:article]
@@ -31,8 +31,8 @@ class TicketsController < ApplicationController
     end
 
     # create ticket
-    if !@ticket.save
-      render :json => @ticket.errors, :status => :unprocessable_entity
+    if !ticket.save
+      render :json => ticket.errors, :status => :unprocessable_entity
       return
     end
 
@@ -42,7 +42,7 @@ class TicketsController < ApplicationController
       tags.each {|tag|
         Tag.tag_add(
           :object        => 'Ticket',
-          :o_id          => @ticket.id,
+          :o_id          => ticket.id,
           :item          => tag,
           :created_by_id => current_user.id,
         )
@@ -51,57 +51,39 @@ class TicketsController < ApplicationController
 
     # create article if given
     if params[:article]
-      form_id  = params[:article][:form_id]
-      params[:article].delete(:form_id)
-      @article = Ticket::Article.new( Ticket::Article.param_validation( params[:article] ) )
-      @article.ticket_id     = @ticket.id
-
-      # find attachments in upload cache
-      if form_id
-        @article.attachments = Store.list(
-          :object => 'UploadCache',
-          :o_id   => form_id,
-        )
-      end
-      if !@article.save
-        render :json => @article.errors, :status => :unprocessable_entity
-        return
-      end
-
-      # remove attachments from upload cache
-      if form_id
-        Store.remove(
-          :object => 'UploadCache',
-          :o_id   => form_id,
-        )
-      end
+      article_create( ticket, params[:article] )
     end
 
-    render :json => @ticket, :status => :created
+    render :json => ticket, :status => :created
   end
 
   # PUT /api/v1/tickets/1
   def update
-    @ticket = Ticket.find(params[:id])
+    ticket = Ticket.find(params[:id])
 
     # permissin check
-    return if !ticket_permission(@ticket)
+    return if !ticket_permission(ticket)
 
-    if @ticket.update_attributes( Ticket.param_validation( params[:ticket] ) )
-      render :json => @ticket, :status => :ok
+    if ticket.update_attributes( Ticket.param_validation( params[:ticket] ) )
+
+      if params[:article]
+        article_create( ticket, params[:article] )
+      end
+
+      render :json => ticket, :status => :ok
     else
-      render :json => @ticket.errors, :status => :unprocessable_entity
+      render :json => ticket.errors, :status => :unprocessable_entity
     end
   end
 
   # DELETE /api/v1/tickets/1
   def destroy
-    @ticket = Ticket.find( params[:id] )
+    ticket = Ticket.find( params[:id] )
 
     # permissin check
-    return if !ticket_permission(@ticket)
+    return if !ticket_permission(ticket)
 
-    @ticket.destroy
+    ticket.destroy
 
     head :ok
   end
@@ -376,4 +358,34 @@ class TicketsController < ApplicationController
     }
   end
 
+  private
+
+  def article_create(ticket, params)
+puts params.inspect
+    # create article if given
+    form_id  = params[:form_id]
+    params.delete(:form_id)
+    article = Ticket::Article.new( Ticket::Article.param_validation( params ) )
+    article.ticket_id = ticket.id
+
+    # find attachments in upload cache
+    if form_id
+      article.attachments = Store.list(
+        :object => 'UploadCache',
+        :o_id   => form_id,
+      )
+    end
+    if !article.save
+      render :json => article.errors, :status => :unprocessable_entity
+      return
+    end
+
+    # remove attachments from upload cache
+    if form_id
+      Store.remove(
+        :object => 'UploadCache',
+        :o_id   => form_id,
+      )
+    end
+  end
 end