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/directives/editor-menu.html.haml
+++ b/app/assets/templates/frontend/directives/editor-menu.html.haml
@@ -14,6 +14,7 @@
      %li.menu-item{"ng-repeat" => "editor in editorManager.externalEditors", "ng-click" => "selectEditor(editor)"}

        .pull-left{"style" => "width: 60%"}
+          %strong.red.medium{"ng-if" => "editor.conflict_of"} Conflicted copy
          .menu-item-title {{editor.name}}
          %a.faded{"ng-if" => "!editor.default", "ng-click" => "setDefaultEditor(editor); $event.stopPropagation();"} Set Default
          %a.red{"ng-if" => "editor.default", "ng-click" => "removeDefaultEditor(editor); $event.stopPropagation();"} Remove Default