auto delete conflicts and show conflict flag

2017-04-21 11:19:14 -05:00
parent ad92c0894d
commit ea77ef99bf
8 changed files with 31 additions and 6 deletions
--- a/app/assets/templates/frontend/notes.html.haml
+++ b/app/assets/templates/frontend/notes.html.haml
@@ -28,7 +28,8 @@
      .infinite-scroll{"infinite-scroll" => "ctrl.paginate()", "can-load" => "true", "threshold" => "200"}
        .note{"ng-repeat" => "note in (ctrl.sortedNotes = (ctrl.tag.notes | filter: ctrl.filterNotes | orderBy: ctrl.sortBy:true | limitTo:ctrl.notesToDisplay))",
            "ng-click" => "ctrl.selectNote(note)", "ng-class" => "{'selected' : ctrl.selectedNote == note}"}
-          .name{"ng-if" => "note.title"}
+          %strong.red.medium{"ng-if" => "note.conflict_of"} Conflicted copy
+          .name{"ng-if" => "note.title || note.conflict_of"}
            {{note.title}}
          .note-preview
            {{note.text}}