From 959faa6a94e2ccd5fc3d31e450d91cad7cd5c0a5 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Fri, 24 Aug 2012 21:40:22 +0200
Subject: [PATCH] Improved link feature.

---
 .../javascripts/app/controllers/link_info.js.coffee       | 8 ++++----
 app/assets/javascripts/app/views/link/add.jst.eco         | 7 ++++---
 app/assets/javascripts/app/views/link/info.jst.eco        | 2 ++
 app/controllers/links_controller.rb                       | 8 ++++----
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/link_info.js.coffee b/app/assets/javascripts/app/controllers/link_info.js.coffee
index 4e347604b..9680b3c38 100644
--- a/app/assets/javascripts/app/controllers/link_info.js.coffee
+++ b/app/assets/javascripts/app/controllers/link_info.js.coffee
@@ -59,7 +59,7 @@ class App.LinkInfo extends App.Controller
 
   edit: (e) =>
     e.preventDefault()
-    if $(e.target).parent().parent().find('[data-type=remove]').is('.hide')
+    if $(e.target).parent().parent().find('[data-type=remove]').hasClass('hide')
       $(e.target).parent().parent().find('[data-type=remove]').removeClass('hide')
     else
       $(e.target).parent().parent().find('[data-type=remove]').addClass('hide')
@@ -123,10 +123,10 @@ class App.LinkAdd extends App.ControllerModal
       url:   '/links/add',
       data:  {
         link_type:                params['link_type'],
-        link_object_source:       'Ticket',
-        link_object_source_value: @object.id,
         link_object_target:       'Ticket',
-        link_object_target_number: params['ticket_number'],
+        link_object_target_value: @object.id,
+        link_object_source:       'Ticket',
+        link_object_source_number: params['ticket_number'],
       }
       processData: true,
       success: (data, status, xhr) =>
diff --git a/app/assets/javascripts/app/views/link/add.jst.eco b/app/assets/javascripts/app/views/link/add.jst.eco
index 32636ebe6..865ffa6f7 100644
--- a/app/assets/javascripts/app/views/link/add.jst.eco
+++ b/app/assets/javascripts/app/views/link/add.jst.eco
@@ -4,7 +4,8 @@
   <h3><%- T('Link') %></h3>
 </div>
 <div class="modal-body">
-  <%- T('Link Ticket#') %>
+  <%- T('Link') %>
+  <%- T(@link_object) %>
   <input type="text" name="ticket_number" value="" class="span2" required/>
   <%- T('as') %>
   <select name="link_type" class="span2" required>
@@ -13,8 +14,8 @@
     <option value="child"><%- T('child') %></option>
     <option value="parent"><%- T('parent') %></option>
   </select>
-  <%- T('with') %>
-  <%- T(@link_object) %>
+  <%- T('of') %>
+  Ticket#
   <%= @object.number %>.
 <!--
   <ul>
diff --git a/app/assets/javascripts/app/views/link/info.jst.eco b/app/assets/javascripts/app/views/link/info.jst.eco
index 21ce9ccab..0e8ba4782 100644
--- a/app/assets/javascripts/app/views/link/info.jst.eco
+++ b/app/assets/javascripts/app/views/link/info.jst.eco
@@ -11,7 +11,9 @@
   <% end %>
 
   <div>
+    <% if !_.isEmpty(@links): %>
     <a href="" data-type="edit" class="icon-edit" title="<%- T('edit') %>"></a>
+    <% end %>
     <a href="" data-type="add" class="icon-plus" title="<%- T('add') %>"></a>
   </div>
 
diff --git a/app/controllers/links_controller.rb b/app/controllers/links_controller.rb
index 734a04482..3de74a681 100644
--- a/app/controllers/links_controller.rb
+++ b/app/controllers/links_controller.rb
@@ -41,13 +41,13 @@ class LinksController < ApplicationController
   def add
 
     # lookup object id
-    object_id = Ticket.where( :number => params[:link_object_target_number] ).first.id
+    object_id = Ticket.where( :number => params[:link_object_source_number] ).first.id
     link = Link.add(
       :link_type                => params[:link_type],
-      :link_object_source       => params[:link_object_source],
-      :link_object_source_value => params[:link_object_source_value],
       :link_object_target       => params[:link_object_target],
-      :link_object_target_value => object_id
+      :link_object_target_value => params[:link_object_target_value],
+      :link_object_source       => params[:link_object_source],
+      :link_object_source_value => object_id
     )
 
     if link