Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved link feature.

Browse source
This commit is contained in:
Martin Edenhofer 2012-08-24 20:54:57 +02:00
parent c031b06aef
commit 112ec68e7d
4 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/assets/javascripts/app/controllers/link_info.js.coffee
View file

@ -3,6 +3,7 @@ $ = jQuery.sub()
class App.LinkInfo extends App.Controller class App.LinkInfo extends App.Controller
events: events:
'click [data-type=add]': 'add', 'click [data-type=add]': 'add',
'click [data-type=edit]': 'edit',
'click [data-type=remove]': 'remove', 'click [data-type=remove]': 'remove',
constructor: -> constructor: ->
@ -41,7 +42,10 @@ class App.LinkInfo extends App.Controller
list[ item['link_type'] ] = [] list[ item['link_type'] ] = []
if item['link_object'] is 'Ticket' if item['link_object'] is 'Ticket'
list[ item['link_type'] ].push App.Ticket.find( item['link_object_value'] ) ticket = App.Ticket.find( item['link_object_value'] )
if ticket.ticket_state.name is 'merged'
ticket.css = 'merged'
list[ item['link_type'] ].push ticket
# insert data # insert data
@html App.view('link/info')( @html App.view('link/info')(
@ -53,6 +57,13 @@ class App.LinkInfo extends App.Controller
# user_id: user_id, # user_id: user_id,
# ) # )
edit: (e) =>
e.preventDefault()
if $(e.target).parent().parent().find('[data-type=remove]').is('.hide')
$(e.target).parent().parent().find('[data-type=remove]').removeClass('hide')
else
$(e.target).parent().parent().find('[data-type=remove]').addClass('hide')
remove: (e) => remove: (e) =>
e.preventDefault() e.preventDefault()
link_type = $(e.target).data('link-type') link_type = $(e.target).data('link-type')

7
app/assets/javascripts/app/views/link/info.jst.eco
View file

@ -5,11 +5,14 @@
<strong><%- T( type ) %></strong> <strong><%- T( type ) %></strong>
<ul> <ul>
<% for item in @links[type]: %> <% for item in @links[type]: %>
<li><a href="#ticket/zoom/<%= item.id %>" data-type="" title="<%= item.title %>">T:<%= item.number %> <%= item.title %></a> <a href="" data-object="Ticket" data-object-id="<%= item.id %>" data-link-type="<%= type %>" data-type="remove" class="icon-remove" title="<%- T('remove') %>"></a></li> <li><a href="#ticket/zoom/<%= item.id %>" data-type="" title="<%= item.title %>" class="<%= item.css %>">T:<%= item.number %> <%= item.title %></a> <a href="" data-object="Ticket" data-object-id="<%= item.id %>" data-link-type="<%= type %>" data-type="remove" class="icon-remove hide" title="<%- T('remove') %>"></a></li>
<% end %> <% end %>
</ul> </ul>
<% end %> <% end %>
<div><a href="" data-type="add" class="icon-plus" title="<%- T('add') %>"></a></div> <div>
<a href="" data-type="edit" class="icon-edit" title="<%- T('edit') %>"></a>
<a href="" data-type="add" class="icon-plus" title="<%- T('add') %>"></a>
</div>
</div> </div>

8
app/assets/stylesheets/zzz.css
View file

@ -24,6 +24,10 @@ body {
background-image: url("../assets/glyphicons-halflings.png"); background-image: url("../assets/glyphicons-halflings.png");
} }
h1, h2, h3, h4, h5, h6 {
margin: 0 0 10px;
}
.navbar .nav > li > a { .navbar .nav > li > a {
padding: 10px 12px 10px; padding: 10px 12px 10px;
} }
@ -209,6 +213,10 @@ footer {
border: 1px solid #fbeed5; border: 1px solid #fbeed5;
} }
.merged, .merge:hover {
text-decoration: line-through;
}
.customer-info { .customer-info {
width:86%; width:86%;
padding-top: 5px; padding-top: 5px;

2
app/controllers/links_controller.rb
View file

@ -39,7 +39,7 @@ class LinksController < ApplicationController
# POST /links/add # POST /links/add
def add def add
# @template.created_by_id = current_user.id
# lookup object id # lookup object id
object_id = Ticket.where( :number => params[:link_object_target_number] ).first.id object_id = Ticket.where( :number => params[:link_object_target_number] ).first.id
link = Link.add( link = Link.add(