Skip to content

Commit 228b886

Browse files
committedOct 20, 2017
Bug 1504511 - Remember template values when clicking back
When editing template parameter values, remember the values when the user clicks back and then forward again. This will still correctly clear the values if the user switches templates in the "Select from Project" dialog. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1504511
1 parent f127c70 commit 228b886

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed
 

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
step-id="{{step.id}}"
2121
step-priority="{{$index}}">
2222
<div class="wizard-pf-main-inner-shadow-covers">
23-
<div ng-if="step.selected" ng-include="step.view" class="wizard-pf-main-form-contents"></div>
23+
<div ng-show="step.selected" ng-include="step.view" class="wizard-pf-main-form-contents"></div>
2424
</div>
2525
</pf-wizard-step>
2626
</pf-wizard>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<fieldset ng-disabled="disableInputs">
1+
<fieldset ng-if="$ctrl.template" ng-disabled="disableInputs">
22
<ng-form name="$ctrl.templateForm">
33
<template-options is-dialog="$ctrl.isDialog" parameters="$ctrl.template.parameters" expand="true" can-toggle="false">
44
<select-project ng-if="!$ctrl.project" on-project-selected="$ctrl.onProjectSelected" available-projects="$ctrl.availableProjects" selected-project="$ctrl.selectedProject" name-taken="$ctrl.projectNameTaken"></select-project>

‎dist/scripts/templates.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8965,7 +8965,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
89658965
"<pf-wizard wizard-title=\"{{!$ctrl.useProjectTemplate && ($ctrl.template | displayName) || 'Select from Project'}}\" hide-sidebar=\"true\" step-class=\"order-service-wizard-step\" wizard-ready=\"$ctrl.wizardReady\" next-title=\"$ctrl.nextTitle\" next-callback=\"$ctrl.next\" on-finish=\"$ctrl.close()\" on-cancel=\"$ctrl.close()\" wizard-done=\"$ctrl.wizardDone\" current-step=\"$ctrl.currentStep\">\n" +
89668966
"<pf-wizard-step ng-repeat=\"step in $ctrl.steps track by step.id\" step-title=\"{{step.label}}\" wz-disabled=\"{{step.hidden}}\" allow-click-nav=\"step.allowClickNav\" next-enabled=\"step.valid\" prev-enabled=\"step.prevEnabled\" on-show=\"step.onShow\" step-id=\"{{step.id}}\" step-priority=\"{{$index}}\">\n" +
89678967
"<div class=\"wizard-pf-main-inner-shadow-covers\">\n" +
8968-
"<div ng-if=\"step.selected\" ng-include=\"step.view\" class=\"wizard-pf-main-form-contents\"></div>\n" +
8968+
"<div ng-show=\"step.selected\" ng-include=\"step.view\" class=\"wizard-pf-main-form-contents\"></div>\n" +
89698969
"</div>\n" +
89708970
"</pf-wizard-step>\n" +
89718971
"</pf-wizard>\n" +
@@ -9070,7 +9070,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
90709070

90719071

90729072
$templateCache.put('views/directives/process-template.html',
9073-
"<fieldset ng-disabled=\"disableInputs\">\n" +
9073+
"<fieldset ng-if=\"$ctrl.template\" ng-disabled=\"disableInputs\">\n" +
90749074
"<ng-form name=\"$ctrl.templateForm\">\n" +
90759075
"<template-options is-dialog=\"$ctrl.isDialog\" parameters=\"$ctrl.template.parameters\" expand=\"true\" can-toggle=\"false\">\n" +
90769076
"<select-project ng-if=\"!$ctrl.project\" on-project-selected=\"$ctrl.onProjectSelected\" available-projects=\"$ctrl.availableProjects\" selected-project=\"$ctrl.selectedProject\" name-taken=\"$ctrl.projectNameTaken\"></select-project>\n" +

0 commit comments

Comments
 (0)
Please sign in to comment.