Fixed buttons for failed contention modal

TIER · Apr 7, 2021 · 748fd14 · 748fd14
1 parent 90e7575
commit 748fd14
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/ui/src/app/contention/component/contention-dialog.component.html b/ui/src/app/contention/component/contention-dialog.component.html
@@ -35,16 +35,17 @@ <h4 class="modal-title"><translate-i18n key="message.data-version-contention">Da
             </div>
         </div>
     </div>
-    <div class="modal-footer">
+    <div class="modal-footer" *ngIf="theirs.length < 1">
         <button
-
-            class="btn btn-info"
-            (click)="activeModal.close(resolutionObj)"
-            [disabled]="!resolutionObj"><translate-i18n key="action.use-mine">Use My Changes</translate-i18n></button>
-        <button
-
-            class="btn btn-danger"
-            (click)="activeModal.dismiss(rejectionObj)"
-            [disabled]="!rejectionObj"><translate-i18n key="action.use-theirs">Use Their Changes</translate-i18n></button>
+            class="btn btn-secondary"
+            (click)="activeModal.dismiss(rejectionObj)"><translate-i18n key="action.cancel">Cancel</translate-i18n></button>
+    </div>
+    <div class="modal-footer" *ngIf="theirs.length > 0">
+        <button class="btn btn-info" (click)="activeModal.close(resolutionObj)" [disabled]="!resolutionObj">
+            <translate-i18n key="action.use-mine">Use My Changes</translate-i18n>
+        </button>
+        <button class="btn btn-danger" (click)="activeModal.dismiss(rejectionObj)" [disabled]="!rejectionObj">
+            <translate-i18n key="action.use-theirs">Use Their Changes</translate-i18n>
+        </button>
     </div>
 </div>