taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Keep the to_tag color on mix_tags service function

remotes/origin/issue/4795/notification_even_they_are_disabled
Jesús Espino 2016-06-09 19:18:52 +02:00 committed by David Barragán Merino
parent b4c81f9c9d
commit fde98473c4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
taiga/projects/services/tags.py
View File

@ -53,8 +53,8 @@ def edit_tag(project, from_tag, to_tag=None, color=None):
project.save() project.save()
def rename_tag(project, from_tag, to_tag): def rename_tag(project, from_tag, to_tag, color=None):
color = dict(project.tags_colors)[from_tag] color = color or dict(project.tags_colors)[from_tag]
sql = """ sql = """
UPDATE userstories_userstory SET tags = array_distinct(array_replace(tags, '{from_tag}', '{to_tag}')) WHERE project_id={project_id}; UPDATE userstories_userstory SET tags = array_distinct(array_replace(tags, '{from_tag}', '{to_tag}')) WHERE project_id={project_id};
UPDATE tasks_task SET tags = array_distinct(array_replace(tags, '{from_tag}', '{to_tag}')) WHERE project_id={project_id}; UPDATE tasks_task SET tags = array_distinct(array_replace(tags, '{from_tag}', '{to_tag}')) WHERE project_id={project_id};
@ -65,7 +65,8 @@ def rename_tag(project, from_tag, to_tag):
cursor.execute(sql) cursor.execute(sql)
tags_colors = dict(project.tags_colors) tags_colors = dict(project.tags_colors)
tags_colors[to_tag] = tags_colors.pop(from_tag) tags_colors.pop(from_tag)
tags_colors[to_tag] = color
project.tags_colors = list(tags_colors.items()) project.tags_colors = list(tags_colors.items())
project.save() project.save()
@ -87,5 +88,6 @@ def delete_tag(project, tag):
def mix_tags(project, from_tags, to_tag): def mix_tags(project, from_tags, to_tag):
color = dict(project.tags_colors)[to_tag]
for from_tag in from_tags: for from_tag in from_tags:
rename_tag(project, from_tag, to_tag) rename_tag(project, from_tag, to_tag, color)