Mercurial Mercurial > iconolab / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixing tag value in the merge tool
authorHarris Baptiste <harris.baptiste@iri.centrepompidou.fr>
Fri, 29 Jul 2016 15:15:46 +0200
changeset 87 2bfbab23b524
parent 86 faa3b3159f0b
child 88 7f27a0071b87
fixing tag value in the merge tool
src/iconolab/templates/iconolab/merge_revision.html file | annotate | diff | comparison | revisions 
--- a/src/iconolab/templates/iconolab/merge_revision.html	Thu Jul 28 17:33:33 2016 +0200
+++ b/src/iconolab/templates/iconolab/merge_revision.html	Fri Jul 29 15:15:46 2016 +0200
@@ -188,7 +188,7 @@
             &nbsp;
             <a  @click="pickTag($event, 'parent-tags')" class="btn btn-default btn-xs" title="Copier vers proposition"><i class="fa fa-chevron-left" aria-hidden="true"></i></a>
             <a class="btn btn-default btn-xs" title="Comparer avec proposition"><i class="fa fa-exchange" aria-hidden="true"></i></a>
-            <typeahead ref="parent-tags" read-only="1" id="merge-parent-revision-tags" :tags="{{ current_tags_data  }}"></typeahead>
+            <typeahead ref="parent-tags" read-only="1" id="merge-parent-revision-tags" :tags="{{ parent_tags_data  }}"></typeahead>
           </fieldset>
 
           <fieldset>
iconolab