From e84a91da5d462c78442b9ff202c45a243cb49b44 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Wed, 5 Aug 2015 16:40:04 +0200
Subject: [PATCH] Moved search result attributes to model.

---
 .../app/controllers/navigation.js.coffee      | 24 +++----------------
 .../app/models/organization.js.coffee         |  7 ++++++
 .../javascripts/app/models/ticket.js.coffee   |  8 ++++++-
 .../javascripts/app/models/user.js.coffee     |  7 ++++++
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/navigation.js.coffee b/app/assets/javascripts/app/controllers/navigation.js.coffee
index 084e82b8f..56fc6dac4 100644
--- a/app/assets/javascripts/app/controllers/navigation.js.coffee
+++ b/app/assets/javascripts/app/controllers/navigation.js.coffee
@@ -166,35 +166,17 @@ class App.Navigation extends App.ControllerWidgetPermanent
               area.result = []
               for id in area.ids
                 ticket = App.Ticket.find( id )
-                data =
-                  display:    "##{ticket.number} - #{ticket.title}"
-                  id:         ticket.id
-                  class:      "level-#{ticket.level()} ticket-popover"
-                  url:        ticket.uiUrl()
-                  iconClass:  "priority"
-                area.result.push data
+                area.result.push ticket.searchResultAttributes()
             else if area.name is 'User'
               area.result = []
               for id in area.ids
                 user = App.User.find( id )
-                data =
-                  display:    "#{user.displayName()}"
-                  id:         user.id
-                  class:      "user user-popover"
-                  url:        user.uiUrl()
-                  iconClass:  "user"
-                area.result.push data
+                area.result.push user.searchResultAttributes()
             else if area.name is 'Organization'
               area.result = []
               for id in area.ids
                 organization = App.Organization.find( id )
-                data =
-                  display:    "#{organization.displayName()}"
-                  id:         organization.id
-                  class:      "organization organization-popover"
-                  url:        organization.uiUrl()
-                  iconClass:  "organization"
-                area.result.push data
+                area.result.push organization.searchResultAttributes()
 
           @renderResult(result)
 
diff --git a/app/assets/javascripts/app/models/organization.js.coffee b/app/assets/javascripts/app/models/organization.js.coffee
index 1748a4b76..68a60be0e 100644
--- a/app/assets/javascripts/app/models/organization.js.coffee
+++ b/app/assets/javascripts/app/models/organization.js.coffee
@@ -30,3 +30,10 @@ class App.Organization extends App.Model
           user = App.User.find( user_id )
           data['members'].push user
     data
+
+  searchResultAttributes: ->
+    display:    "#{@displayName()}"
+    id:         @id
+    class:      "organization organization-popover"
+    url:        @uiUrl()
+    iconClass:  "organization"
\ No newline at end of file
diff --git a/app/assets/javascripts/app/models/ticket.js.coffee b/app/assets/javascripts/app/models/ticket.js.coffee
index c941a3963..e87e0f3f3 100644
--- a/app/assets/javascripts/app/models/ticket.js.coffee
+++ b/app/assets/javascripts/app/models/ticket.js.coffee
@@ -50,4 +50,10 @@ class App.Ticket extends App.Model
   iconActivity: (user) ->
     if @owner_id == user.id
       return 'important'
-    ''
\ No newline at end of file
+    ''
+  searchResultAttributes: ->
+    display:    "##{@number} - #{@title}"
+    id:         @id
+    class:      "level-#{@level()} ticket-popover"
+    url:        @uiUrl()
+    iconClass:  "priority"
diff --git a/app/assets/javascripts/app/models/user.js.coffee b/app/assets/javascripts/app/models/user.js.coffee
index a37b09397..cedbf80c4 100644
--- a/app/assets/javascripts/app/models/user.js.coffee
+++ b/app/assets/javascripts/app/models/user.js.coffee
@@ -119,3 +119,10 @@ class App.User extends App.Model
           data['groups'].push group
 
     data
+
+  searchResultAttributes: ->
+    display:    "#{@displayName()}"
+    id:         @id
+    class:      "user user-popover"
+    url:        @uiUrl()
+    iconClass:  "user"
\ No newline at end of file