From a0caaa06e9a23691ce16d4380bcf61cb357e8528 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Tue, 13 Dec 2016 14:58:13 +0100
Subject: [PATCH] Cleanup, fixed typos and improved error handling.

---
 app/assets/javascripts/app/controllers/monitoring.coffee    | 2 --
 app/assets/javascripts/app/views/agent_user_create.jst.eco  | 2 +-
 app/assets/javascripts/app/views/calendar/index.jst.eco     | 6 +++---
 .../javascripts/app/views/customer_ticket_create.jst.eco    | 2 +-
 app/assets/javascripts/app/views/modal.jst.eco              | 2 +-
 app/models/calendar.rb                                      | 2 +-
 app/models/organization/search.rb                           | 4 +++-
 app/models/permission.rb                                    | 2 +-
 app/models/ticket/search.rb                                 | 4 +++-
 app/models/user/search.rb                                   | 4 +++-
 lib/app_version.rb                                          | 2 +-
 test/unit/email_process_test.rb                             | 2 ++
 12 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/monitoring.coffee b/app/assets/javascripts/app/controllers/monitoring.coffee
index 5850e8102..c43b29142 100644
--- a/app/assets/javascripts/app/controllers/monitoring.coffee
+++ b/app/assets/javascripts/app/controllers/monitoring.coffee
@@ -23,9 +23,7 @@ class Index extends App.ControllerSubContent
       url:   "#{@apiPath}/monitoring/health_check"
       success: (data) =>
         @stopLoading()
-        console.log('111', data, @data)
         return if @data && data.token is @data.token && data.healthy is @data.healthy && data.message is @data.message
-        console.log('222')
         @data = data
         @render()
     )
diff --git a/app/assets/javascripts/app/views/agent_user_create.jst.eco b/app/assets/javascripts/app/views/agent_user_create.jst.eco
index 09d947c51..5ede093f9 100644
--- a/app/assets/javascripts/app/views/agent_user_create.jst.eco
+++ b/app/assets/javascripts/app/views/agent_user_create.jst.eco
@@ -1,4 +1,4 @@
-<form>
+<form autocomplete="off">
 <div class="modal-dialog">
   <div class="modal-content">
     <div class="modal-header">
diff --git a/app/assets/javascripts/app/views/calendar/index.jst.eco b/app/assets/javascripts/app/views/calendar/index.jst.eco
index 9b7fbf7d9..5c5d24e7b 100644
--- a/app/assets/javascripts/app/views/calendar/index.jst.eco
+++ b/app/assets/javascripts/app/views/calendar/index.jst.eco
@@ -77,12 +77,12 @@
     </div>
     <div class="action-controls">
       <% if !calendar.default: %>
-        <div class="sla-toggle btn btn--danger btn--secondary js-delete"><%- @T('Delete') %></div>
-        <div class="sla-toggle btn btn--secondary js-default"><%- @T('Set as Default') %></div>
+        <div class="btn btn--danger btn--secondary js-delete"><%- @T('Delete') %></div>
+        <div class="btn btn--secondary js-default"><%- @T('Set as Default') %></div>
       <% else: %>
         <div class="btn btn--danger btn--secondary is-disabled"><%- @T('Delete') %></div>
       <% end %>
-      <div class="sla-edit btn js-edit"><%- @T('Edit') %></div>
+      <div class="btn js-edit"><%- @T('Edit') %></div>
     </div>
   </div>
   <% end %>
diff --git a/app/assets/javascripts/app/views/customer_ticket_create.jst.eco b/app/assets/javascripts/app/views/customer_ticket_create.jst.eco
index 7dfbee9be..f8c7b7f4e 100644
--- a/app/assets/javascripts/app/views/customer_ticket_create.jst.eco
+++ b/app/assets/javascripts/app/views/customer_ticket_create.jst.eco
@@ -7,7 +7,7 @@
         </div>
 
         <div class="page-content">
-          <form role="form" class="ticket-create">
+          <form role="form" class="ticket-create" autocomplete="off">
             <input type="hidden" name="form_id" value="<%= @form_id %>"/>
 
             <div class="ticket-form-top"></div>
diff --git a/app/assets/javascripts/app/views/modal.jst.eco b/app/assets/javascripts/app/views/modal.jst.eco
index db7be63ab..67d0145b3 100644
--- a/app/assets/javascripts/app/views/modal.jst.eco
+++ b/app/assets/javascripts/app/views/modal.jst.eco
@@ -1,5 +1,5 @@
 <div class="modal-dialog">
-  <form>
+  <form autocomplete="off">
     <div class="modal-content">
       <div class="modal-header">
   <% if @buttonClose: %>
diff --git a/app/models/calendar.rb b/app/models/calendar.rb
index 460567cde..b7eb8abd3 100644
--- a/app/models/calendar.rb
+++ b/app/models/calendar.rb
@@ -68,7 +68,7 @@ returns calendar object
 
 =begin
 
-returnes preset of ical feeds
+returns preset of ical feeds
 
   feeds = Calendar.ical_feeds
 
diff --git a/app/models/organization/search.rb b/app/models/organization/search.rb
index 4e367ed4a..5222842f3 100644
--- a/app/models/organization/search.rb
+++ b/app/models/organization/search.rb
@@ -61,7 +61,9 @@ returns
         items = SearchIndexBackend.search(query, limit, 'Organization')
         organizations = []
         items.each { |item|
-          organizations.push Organization.lookup(id: item[:id])
+          organization = Organization.lookup(id: item[:id])
+          next if !organization
+          organizations.push organization
         }
         return organizations
       end
diff --git a/app/models/permission.rb b/app/models/permission.rb
index c5c529ba9..45c0397de 100644
--- a/app/models/permission.rb
+++ b/app/models/permission.rb
@@ -11,7 +11,7 @@ class Permission < ApplicationModel
 
   permissions = Permission.with_parents('some_key.sub_key')
 
-returnes
+returns
 
   ['some_key.sub_key', 'some_key']
 
diff --git a/app/models/ticket/search.rb b/app/models/ticket/search.rb
index aede46d27..598ffe22c 100644
--- a/app/models/ticket/search.rb
+++ b/app/models/ticket/search.rb
@@ -143,7 +143,9 @@ returns
       end
       tickets = []
       items.each { |item|
-        tickets.push Ticket.lookup(id: item[:id])
+        ticket = Ticket.lookup(id: item[:id])
+        next if !ticket
+        tickets.push ticket
       }
       return tickets
     end
diff --git a/app/models/user/search.rb b/app/models/user/search.rb
index 1b6c54332..37286e578 100644
--- a/app/models/user/search.rb
+++ b/app/models/user/search.rb
@@ -61,7 +61,9 @@ returns
         items = SearchIndexBackend.search(query, limit, 'User')
         users = []
         items.each { |item|
-          users.push User.lookup(id: item[:id])
+          user = User.lookup(id: item[:id])
+          next if !user
+          users.push user
         }
         return users
       end
diff --git a/lib/app_version.rb b/lib/app_version.rb
index 1c35e87c6..2c8fd0d69 100644
--- a/lib/app_version.rb
+++ b/lib/app_version.rb
@@ -55,7 +55,7 @@ types:
   restart_auto -> app is restarting
   config_changed -> config has changed
 
-returnes
+returns
 
   {
     event: 'maintenance'
diff --git a/test/unit/email_process_test.rb b/test/unit/email_process_test.rb
index e4914a4e5..ecd4d192f 100644
--- a/test/unit/email_process_test.rb
+++ b/test/unit/email_process_test.rb
@@ -4,6 +4,8 @@ require 'test_helper'
 
 class EmailProcessTest < ActiveSupport::TestCase
   test 'process simple' do
+    Ticket.destroy_all
+    
     files = [
       {
         data: 'From: me@example.com