Skip to content

Commit 9e2599c

Browse files
author
OpenShift Bot
authored
Merge pull request #1674 from spadgett/rollback-confirm-on-exit
Merged by openshift-bot
2 parents 513fa44 + 0ae3bbf commit 9e2599c

36 files changed

+42
-117
lines changed

‎app/scripts/controllers/addConfigVolume.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ angular.module('openshiftConsole')
8181
};
8282

8383
var navigateBack = function() {
84-
_.set($scope, 'confirm.doneEditing', true);
8584
$window.history.back();
8685
};
8786

‎app/scripts/controllers/attachPVC.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ angular.module('openshiftConsole')
101101
};
102102

103103
var navigateBack = function() {
104-
_.set($scope, 'confirm.doneEditing', true);
105104
$window.history.back();
106105
};
107106

‎app/scripts/controllers/create/createFromImage.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,6 @@ angular.module("openshiftConsole")
323323
};
324324
}
325325
);
326-
_.set($scope, 'confirm.doneEditing', true);
327326
Navigate.toNextSteps($scope.name, $scope.projectName, {
328327
usingSampleRepo: $scope.usingSampleRepo(),
329328
breadcrumbTitle: breadcrumbTitle

‎app/scripts/controllers/createPersistentVolumeClaim.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ angular.module('openshiftConsole')
5656
var claim = generatePersistentVolumeClaim();
5757
DataService.create('persistentvolumeclaims', null, claim, context)
5858
.then(function() { // Success
59-
_.set($scope, 'confirm.doneEditing', true);
6059
// Return to the previous page
6160
$window.history.back();
6261
},

‎app/scripts/controllers/createRoute.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ angular.module('openshiftConsole')
5151
};
5252

5353
var navigateBack = function() {
54-
_.set($scope, 'confirm.doneEditing', true);
5554
$window.history.back();
5655
};
5756

‎app/scripts/controllers/edit/autoscaler.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ angular.module('openshiftConsole')
113113
group: 'autoscaling'
114114
}, null, hpa, context)
115115
.then(function() { // Success
116-
_.set($scope, 'confirm.doneEditing', true);
117116
// Return to the previous page
118117
$window.history.back();
119118
}, function(result) { // Failure
@@ -136,7 +135,6 @@ angular.module('openshiftConsole')
136135
group: 'autoscaling'
137136
}, hpa.metadata.name, hpa, context)
138137
.then(function() { // Success
139-
_.set($scope, 'confirm.doneEditing', true);
140138
// Return to the previous page
141139
$window.history.back();
142140
}, function(result) { // Failure

‎app/scripts/controllers/edit/buildConfig.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,6 @@ angular.module('openshiftConsole')
211211
var buildStrategy = $filter('buildStrategy');
212212

213213
var navigateBack = function() {
214-
_.set($scope, 'confirm.doneEditing', true);
215-
216214
var buildConfigURL;
217215
if ($scope.buildConfig) {
218216
buildConfigURL = Navigate.resourceURL($scope.buildConfig);

‎app/scripts/controllers/edit/deploymentConfig.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -316,10 +316,6 @@ angular.module('openshiftConsole')
316316
return updatedTriggers;
317317
};
318318

319-
var doneEditing = function() {
320-
_.set($scope, 'confirm.doneEditing', true);
321-
};
322-
323319
var hideErrorNotifications = function() {
324320
NotificationsService.hideNotification("edit-deployment-config-error");
325321
};
@@ -380,7 +376,6 @@ angular.module('openshiftConsole')
380376
type: "success",
381377
message: "Deployment config " + $scope.updatedDeploymentConfig.metadata.name + " was successfully updated."
382378
});
383-
doneEditing();
384379
var returnURL = Navigate.resourceURL($scope.updatedDeploymentConfig);
385380
$location.url(returnURL);
386381
},
@@ -398,7 +393,6 @@ angular.module('openshiftConsole')
398393

399394
$scope.cancel = function() {
400395
hideErrorNotifications();
401-
doneEditing();
402396
$window.history.back();
403397
};
404398

‎app/scripts/controllers/edit/healthChecks.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ angular.module('openshiftConsole')
6464
};
6565

6666
var navigateBack = function() {
67-
_.set($scope, 'confirm.doneEditing', true);
6867
$location.url($scope.resourceURL);
6968
};
7069

‎app/scripts/controllers/edit/project.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ angular.module('openshiftConsole')
6161
ProjectsService
6262
.update($routeParams.project, mergeEditable(project, $scope.editableFields))
6363
.then(function() {
64-
_.set($scope, 'confirm.doneEditing', true);
6564
if ($routeParams.then) {
6665
$location.path($routeParams.then);
6766
}

‎app/scripts/controllers/edit/route.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ angular.module('openshiftConsole')
4646
};
4747

4848
var navigateBack = function() {
49-
_.set($scope, 'confirm.doneEditing', true);
50-
$scope.doneEditing = true;
5149
$location.path($scope.routeURL);
5250
};
5351

‎app/scripts/controllers/setLimits.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ angular.module('openshiftConsole')
7171
};
7272

7373
var navigateBack = function() {
74-
_.set($scope, 'confirm.doneEditing', true);
7574
$location.url($scope.resourceURL);
7675
};
7776

‎app/scripts/directives/createSecret.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ angular.module("openshiftConsole")
213213
hideErrorNotifications();
214214
var newSecret = constructSecretObject($scope.newSecret.data, $scope.newSecret.authType);
215215
DataService.create('secrets', null, newSecret, $scope).then(function(secret) { // Success
216-
_.set($scope, 'confirm.doneEditing', true);
217216
// In order to link:
218217
// - the SA has to be defined
219218
// - defined SA has to be present in the obtained SA list
@@ -244,7 +243,6 @@ angular.module("openshiftConsole")
244243
};
245244

246245
$scope.cancel = function() {
247-
_.set($scope, 'confirm.doneEditing', true);
248246
hideErrorNotifications();
249247
$scope.onCancel();
250248
};

‎app/scripts/directives/deployImage.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@ angular.module("openshiftConsole")
250250
return d.promise;
251251
});
252252

253-
_.set($scope, 'confirm.doneEditing', true);
254253
Navigate.toNextSteps($scope.app.name, $scope.project);
255254
};
256255

‎app/scripts/directives/fromFile.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,6 @@ angular.module("openshiftConsole")
264264
// When redirecting to newFromTemplate page, use the cached Template if user doesn't adds it into the
265265
// namespace by the create process or if the template is being updated.
266266
function redirect() {
267-
_.set($scope, 'confirm.doneEditing', true);
268-
269267
var path;
270268
if ($scope.resourceKind === "Template" && $scope.templateOptions.process && !$scope.errorOccured) {
271269
var namespace = ($scope.templateOptions.add || $scope.updateResources.length > 0) ? $scope.projectName : "";

‎app/scripts/directives/processTemplate.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ function ProcessTemplate($filter,
121121
return d.promise;
122122
});
123123

124-
_.set(ctrl, 'confirm.doneEditing', true);
125124
if (ctrl.isDialog) {
126125
$scope.$emit('templateInstantiated', {
127126
project: ctrl.selectedProject,

‎app/views/add-config-volume.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ <h1>Add Config Files</h1>
3838
Add values from a config map or secret as volume. This will make the data available as files for {{kind | humanizeKind}} {{name}}.
3939
</div>
4040
<form name="forms.addConfigVolumeForm" class="mar-top-lg">
41-
<confirm-on-exit dirty="forms.addConfigVolumeForm.$dirty && !confirm.doneEditing"></confirm-on-exit>
4241
<fieldset ng-disabled="disableInputs">
4342
<div class="form-group">
4443
<label class="required">Source</label>

‎app/views/attach-pvc.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ <h1>Add Storage</h1>
4141
Add an existing persistent volume claim to the template of {{kind | humanizeKind}} {{name}}.
4242
</div>
4343
<form name="attachPVCForm" class="mar-top-lg">
44-
<confirm-on-exit dirty="attachPVCForm.$dirty && !confirm.doneEditing"></confirm-on-exit>
4544
<fieldset ng-disabled="disableInputs">
4645
<div class="form-group">
4746
<label for="persistentVolumeClaim" class="required">Storage</label>

‎app/views/browse/deployment.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,11 @@ <h3>Autoscaling</h3>
253253
<uib-tab heading="Environment" active="selectedTab.environment" ng-if="deployment">
254254
<uib-tab-heading>Environment</uib-tab-heading>
255255
<ng-form name="forms.deploymentEnvVars">
256+
<confirm-on-exit
257+
ng-if="{ group: 'extensions', resource: 'deployments' } | canI : 'update'"
258+
dirty="forms.deploymentEnvVars.$dirty">
259+
</confirm-on-exit>
260+
256261
<div ng-repeat="container in updatedDeployment.spec.template.spec.containers">
257262
<h3>Container {{container.name}} Environment Variables</h3>
258263
<key-value-editor

‎app/views/create-persistent-volume-claim.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ <h1>Create Storage</h1>
2020
<a href="{{'persistent_volumes' | helpLink}}" target="_blank"><span class="learn-more-inline">Learn More&nbsp;<i class="fa fa-external-link" aria-hidden="true"></i></span></a>
2121
</div>
2222
<form name="createPersistentVolumeClaimForm" class="mar-top-lg">
23-
<confirm-on-exit dirty="createPersistentVolumeClaimForm.$dirty && !confirm.doneEditing"></confirm-on-exit>
2423
<fieldset ng-disabled="disableInputs">
2524
<osc-persistent-volume-claim model="claim" project-name="projectName"></osc-persistent-volume-claim>
2625
<div class="button-group gutter-bottom">
@@ -29,10 +28,7 @@ <h1>Create Storage</h1>
2928
ng-click="createPersistentVolumeClaim()"
3029
ng-disabled="createPersistentVolumeClaimForm.$invalid || disableInputs"
3130
value="">Create</button>
32-
<a class="btn btn-default btn-lg"
33-
href=""
34-
ng-click="confirm.doneEditing = true"
35-
back>Cancel</a>
31+
<a class="btn btn-default btn-lg" href="" back>Cancel</a>
3632
</div>
3733
</fieldset>
3834
</form>

‎app/views/create-route.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ <h1>Create Route</h1>
1818
Routing is a way to make your application publicly visible.
1919
</div>
2020
<form name="createRouteForm" class="mar-top-xl osc-form">
21-
<confirm-on-exit dirty="createRouteForm.$dirty && !confirm.doneEditing"></confirm-on-exit>
2221
<div ng-if="!services">Loading...</div>
2322
<div ng-if="services">
2423
<fieldset ng-disabled="disableInputs">

‎app/views/create/fromimage.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<osc-image-summary resource="image" name="displayName || imageName" tag="imageTag"></osc-image-summary>
2727
<div class="clearfix visible-xs-block"></div>
2828
<form class="" ng-show="imageStream" novalidate name="form" ng-submit="createApp()">
29-
<confirm-on-exit dirty="form.$dirty && !confirm.doneEditing"></confirm-on-exit>
3029
<div style="margin-bottom: 15px;">
3130
<div class="form-group">
3231
<label for="appname" class="required">Name</label>
@@ -419,9 +418,7 @@ <h3>Environment Variables <span class="appended-icon">(Runtime only) <span class
419418
class="btn btn-primary btn-lg"
420419
ng-disabled="form.$invalid || nameTaken || cpuProblems.length || memoryProblems.length || disableInputs"
421420
>Create</button>
422-
<a class="btn btn-default btn-lg"
423-
ng-click="confirm.doneEditing = true"
424-
ng-href="{{projectName | projectOverviewURL}}">Cancel</a>
421+
<a class="btn btn-default btn-lg" ng-href="{{projectName | projectOverviewURL}}">Cancel</a>
425422
</div>
426423
</form>
427424
</fieldset>

‎app/views/directives/create-secret.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<ng-form name="secretForm" class="create-secret-form">
2-
<confirm-on-exit dirty="secretForm.$dirty && !confirm.doneEditing"></confirm-on-exit>
32
<div for="secretType" ng-if="!type" class="form-group mar-top-lg">
43
<label>Secret Type</label>
54
<ui-select required ng-model="newSecret.type" search-enabled="false" ng-change="newSecret.authType = secretAuthTypeMap[newSecret.type].authTypes[0].id">

‎app/views/directives/deploy-image.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ <h2>
109109
<div class="row" ng-if-end>
110110
<div class="col-sm-12">
111111
<form name="form" class="osc-form">
112-
<confirm-on-exit dirty="form.$dirty && !confirm.doneEditing"></confirm-on-exit>
113112
<div class="form-group">
114113
<label for="name" class="required">Name</label>
115114
<div ng-class="{'has-error': form.name.$invalid || nameTaken}">
@@ -190,10 +189,7 @@ <h2>
190189
ng-click="create()"
191190
value=""
192191
ng-disabled="form.$invalid || nameTaken || disableInputs">Create</button>
193-
<a class="btn btn-default btn-lg"
194-
ng-click="confirm.doneEditing = true"
195-
href="#"
196-
back>Cancel</a>
192+
<a class="btn btn-default btn-lg" href="#" back>Cancel</a>
197193
</div>
198194
</form>
199195
</div>

‎app/views/directives/from-file.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<div class="row">
77
<div class="col-sm-12 pod-bottom-xl">
88
<form name="form">
9-
<confirm-on-exit dirty="form.$dirty && !confirm.doneEditing"></confirm-on-exit>
109
<div class="form-group" id="from-file">
1110
<osc-file-input
1211
model="editorContent"
@@ -35,7 +34,6 @@
3534
Create
3635
</button>
3736
<a class="btn btn-default btn-lg"
38-
ng-click="confirm.doneEditing = true"
3937
ng-href="{{projectName | projectOverviewURL}}">
4038
Cancel
4139
</a>

‎app/views/directives/process-template.html

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<fieldset ng-disabled="disableInputs">
22
<ng-form name="$ctrl.templateForm">
3-
<confirm-on-exit dirty="$ctrl.templateForm.$dirty && !$ctrl.confirm.doneEditing"></confirm-on-exit>
43
<template-options is-dialog="$ctrl.isDialog" parameters="$ctrl.template.parameters" expand="true" can-toggle="false">
54
<select-project ng-if="!$ctrl.project" selected-project="$ctrl.selectedProject" name-taken="$ctrl.projectNameTaken"></select-project>
65
</template-options>
76
<!-- TODO: Also support advanced options for new projects. -->
87
<div ng-if="$ctrl.isDialog && $ctrl.selectedProject.metadata.uid" class="form-group">
98
<!-- TODO: Preserve entered form values. -->
109
To set optional parameters or labels, view
11-
<a ng-click="$ctrl.confirm.doneEditing = true"
12-
ng-href="{{$ctrl.template | createFromTemplateURL : $ctrl.selectedProject.metadata.name}}">advanced options</a>.
10+
<a ng-href="{{$ctrl.template | createFromTemplateURL : $ctrl.selectedProject.metadata.name}}">advanced options</a>.
1311
</div>
1412
<label-editor
1513
ng-if="!$ctrl.isDialog"
@@ -22,9 +20,7 @@
2220
<alerts alerts="$ctrl.precheckAlerts"></alerts>
2321
<div ng-if="!$ctrl.isDialog" class="buttons gutter-top-bottom">
2422
<button class="btn btn-primary btn-lg" ng-click="$ctrl.createFromTemplate()" ng-disabled="$ctrl.templateForm.$invalid || $ctrl.disableInputs">Create</button>
25-
<a class="btn btn-default btn-lg"
26-
ng-href="{{$ctrl.project | projectOverviewURL}}"
27-
ng-click="$ctrl.confirm.doneEditing = true">Cancel</a>
23+
<a class="btn btn-default btn-lg" ng-href="{{$ctrl.project | projectOverviewURL}}">Cancel</a>
2824
</div>
2925
</ng-form>
3026
</fieldset>

‎app/views/edit/autoscaler.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
Loading...
1818
</div>
1919
<form name="form" ng-submit="save()" class="osc-form" ng-show="targetKind && targetName">
20-
<confirm-on-exit dirty="form.$dirty && !confirm.doneEditing"></confirm-on-exit>
2120
<h1>
2221
Autoscale {{targetKind | humanizeKind : true}} {{targetName}}
2322
</h1>
@@ -68,10 +67,7 @@ <h1>
6867
ng-disabled="form.$invalid || form.$pristine">
6968
Save
7069
</button>
71-
<a href=""
72-
ng-click="confirm.doneEditing = true"
73-
class="btn btn-default btn-lg"
74-
back>Cancel</a>
70+
<a href="" class="btn btn-default btn-lg" back>Cancel</a>
7571
</div>
7672
</fieldset>
7773
</form>

‎app/views/edit/build-config.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ <h1>
1818
</h1>
1919
<fieldset ng-disabled="disableInputs">
2020
<form class="edit-form" name="form" novalidate ng-submit="save()">
21-
<confirm-on-exit dirty="form.$dirty && !confirm.doneEditing"></confirm-on-exit>
2221
<div class="row">
2322
<div class="col-lg-12">
2423
<div ng-if="buildConfig.spec.source.type !== 'None'" class="section">

‎app/views/edit/config-map.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ <h1>Edit Config Map {{configMap.metadata.name}}</h1>
2222
<div class="mar-top-xl">
2323
<div ng-if="!loaded">Loading...</div>
2424
<form ng-if="loaded" name="forms.editConfigMapForm">
25-
<confirm-on-exit dirty="forms.editConfigMapForm.$dirty && !confirm.doneEditing"></confirm-on-exit>
2625
<div ng-if="resourceChanged && !resourceDeleted && !updatingNow" class="alert alert-warning">
2726
<span class="pficon pficon-warning-triangle-o" aria-hidden="true"></span>
2827
<span class="sr-only">Warning:</span>
@@ -42,7 +41,7 @@ <h1>Edit Config Map {{configMap.metadata.name}}</h1>
4241
ng-click="updateConfigMap()"
4342
ng-disabled="forms.editConfigMapForm.$invalid || forms.editConfigMapForm.$pristine || disableInputs || resourceChanged || resourceDeleted"
4443
value="">Save</button>
45-
<a class="btn btn-default btn-lg" href="#" ng-click="confirm.doneEditing = true" back>Cancel</a>
44+
<a class="btn btn-default btn-lg" href="#" back>Cancel</a>
4645
</div>
4746
</fieldset>
4847
</form>

‎app/views/edit/deployment-config.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ <h1>
1818
</h1>
1919
<fieldset ng-disabled="disableInputs">
2020
<form class="edit-form" name="form" novalidate>
21-
<confirm-on-exit dirty="form.$dirty && !confirm.doneEditing"></confirm-on-exit>
2221
<div class="row">
2322
<div class="col-lg-12">
2423
<div class="section">

‎app/views/edit/health-checks.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<div class="col-md-12">
1515
<div ng-show="!containers.length" class="mar-top-md">Loading...</div>
1616
<form ng-show="containers.length" name="form" class="health-checks-form">
17-
<confirm-on-exit dirty="form.$dirty && !confirm.doneEditing"></confirm-on-exit>
1817
<h1>Health Checks: {{name}}</h1>
1918
<div class="help-block">
2019
Container health is periodically checked using readiness and liveness probes.

‎app/views/edit/project.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ <h1 style="margin-bottom: 5px;">Edit Project {{project.metadata.name}}</h1>
1414
<div class="help-block mar-bottom-lg">Update the display name and description of your project. The project's unique name cannot be modified.</div>
1515
<alerts alerts="alerts"></alerts>
1616
<form name="editProjectForm">
17-
<confirm-on-exit dirty="editProjectForm && !confirm.doneEditing"></confirm-on-exit>
1817
<fieldset ng-disabled="disableInputs">
1918
<div class="form-group">
2019
<label for="displayName">Display Name</label>
@@ -41,10 +40,7 @@ <h1 style="margin-bottom: 5px;">Edit Project {{project.metadata.name}}</h1>
4140
ng-click="update()"
4241
ng-disabled="editProjectForm.$invalid || disableInputs"
4342
value="">Save</button>
44-
<a class="btn btn-default btn-lg"
45-
href="#"
46-
ng-click="confirm.doneEditing = true"
47-
back>Cancel</a>
43+
<a class="btn btn-default btn-lg" href="#" back>Cancel</a>
4844
</div>
4945
</fieldset>
5046
</form>

‎app/views/edit/route.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ <h1>Edit Route {{routeName}}</h1>
1818
</div>
1919
<form name="form">
2020
<fieldset ng-disabled="disableInputs" ng-if="!loading">
21-
<confirm-on-exit dirty="form.$dirty && !confirm.doneEditing"></confirm-on-exit>
2221
<osc-routing
2322
model="routing"
2423
services="services"

0 commit comments

Comments
 (0)