From a96c1a710861670d7bb3b08f16462ade372dacb3 Mon Sep 17 00:00:00 2001
From: Scott D Brooks <clockworked24.7@gmail.com>
Date: Mon, 7 Jan 2019 16:36:24 -0800
Subject: [PATCH] Fix for DHFPROD-1161

---
 quick-start/src/main/ui/app/mappings/map.component.ts       | 1 -
 .../ui/app/shared/components/mappings/map-ui.component.html | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/quick-start/src/main/ui/app/mappings/map.component.ts b/quick-start/src/main/ui/app/mappings/map.component.ts
index 39a46c3903..ef1a62be93 100644
--- a/quick-start/src/main/ui/app/mappings/map.component.ts
+++ b/quick-start/src/main/ui/app/mappings/map.component.ts
@@ -231,7 +231,6 @@ export class MapComponent implements OnInit {
       this.loadMap();
       this.router.navigate(['/mappings', tmpEntityName, tmpMapName]);
     });
-    this.router.navigate(['/mappings']);
   }
 
   /**
diff --git a/quick-start/src/main/ui/app/shared/components/mappings/map-ui.component.html b/quick-start/src/main/ui/app/shared/components/mappings/map-ui.component.html
index 3d876452ce..5c99f7f39c 100644
--- a/quick-start/src/main/ui/app/shared/components/mappings/map-ui.component.html
+++ b/quick-start/src/main/ui/app/shared/components/mappings/map-ui.component.html
@@ -21,10 +21,8 @@ <h1>
       </div>
 
       <div id="save-map">
-        <mdl-button *ngIf="mapChanged()" mdl-button-type="raised" mdl-colored="primary" mdl-ripple ng-class="btn-save-map" (click)="onSaveMap()">Save Mapping</mdl-button>
-        <mdl-button *ngIf="!mapChanged()" mdl-button-type="raised" mdl-colored="primary" mdl-ripple ng-class="btn-save-map" disabled>Save Mapping</mdl-button>
-        <mdl-button *ngIf="mapChanged()" mdl-button-type="raised" mdl-colored mdl-ripple ng-class="btn-cancel-map" (click)="onResetMap()">Reset</mdl-button>
-        <mdl-button *ngIf="!mapChanged()" mdl-button-type="raised" mdl-colored mdl-ripple ng-class="btn-cancel-map" disabled>Reset</mdl-button>
+        <mdl-button mdl-button-type="raised" mdl-colored="primary" mdl-ripple ng-class="btn-save-map" [disabled]="!mapChanged()" (click)="mapChanged() && onSaveMap()">Save Mapping</mdl-button>
+        <mdl-button mdl-button-type="raised" mdl-colored mdl-ripple ng-class="btn-cancel-map" [disabled]="!mapChanged()" (click)="mapChanged() && onResetMap()">Reset</mdl-button>
       </div>
 
     </div>