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

Fixed issue #777 - Wrong behaviour in tagging functionality.

Browse source
This commit is contained in:
Rolf Schmidt 2017-09-06 13:48:57 +02:00
parent e7eab89bce
commit 4fab8007e4
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/ticket_zoom.coffee
View file

@ -693,7 +693,7 @@ class App.TicketZoom extends App.Controller
tagAdd: (tag) => tagAdd: (tag) =>
return if !@sidebar return if !@sidebar
return if !@sidebar.reload return if !@sidebar.reload
@sidebar.reload(tagAdd: tag) @sidebar.reload(tagAdd: tag, source: 'macro')
tagRemove: (tag) => tagRemove: (tag) =>
return if !@sidebar return if !@sidebar
return if !@sidebar.reload return if !@sidebar.reload

2
app/assets/javascripts/app/controllers/ticket_zoom/sidebar_ticket.coffee
View file

@ -69,7 +69,7 @@ class SidebarTicket extends App.Controller
if args.tags if args.tags
@tagWidget.reload(args.tags) @tagWidget.reload(args.tags)
if args.tagAdd if args.tagAdd
@tagWidget.add(args.tagAdd) @tagWidget.add(args.tagAdd, args.source)
if args.tagRemove if args.tagRemove
@tagWidget.remove(args.tagRemove) @tagWidget.remove(args.tagRemove)

8
app/assets/javascripts/app/controllers/widget/tag.coffee
View file

@ -86,16 +86,16 @@ class App.WidgetTag extends App.Controller
return return
@add(item) @add(item)
add: (items) => add: (items, source = '') =>
for item in items.split(',') for item in items.split(',')
item = item.trim() item = item.trim()
@addItem(item) @addItem(item, source)
addItem: (item) => addItem: (item, source = '') =>
if _.contains(@localTags, item) if _.contains(@localTags, item)
@render() @render()
return return
return if App.Config.get('tag_new') is false && !@possibleTags[item] return if source != 'macro' && App.Config.get('tag_new') is false && !@possibleTags[item]
@localTags.push item @localTags.push item
@render() @render()
App[@object_type].tagAdd(@object.id, item) App[@object_type].tagAdd(@object.id, item)