Skip to content

Commit

Permalink
Merge pull request #2115 from spadgett/template-dialog-select-project
Browse files Browse the repository at this point in the history
Merged by openshift-bot
  • Loading branch information
OpenShift Bot committed Sep 19, 2017
2 parents 2041c75 + 250ba44 commit c63e2f5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/views/directives/from-file-dialog.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<div class="osc-form">
<alerts alerts="$ctrl.alerts"></alerts>
<form name="$ctrl.templateForm">
<process-template project="$ctrl.project" template="$ctrl.template" alerts="$ctrl.alerts" is-dialog="true"></process-template>
<process-template project="$ctrl.selectedProject" template="$ctrl.template" alerts="$ctrl.alerts" is-dialog="true"></process-template>
</form>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -7020,7 +7020,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div class=\"osc-form\">\n" +
"<alerts alerts=\"$ctrl.alerts\"></alerts>\n" +
"<form name=\"$ctrl.templateForm\">\n" +
"<process-template project=\"$ctrl.project\" template=\"$ctrl.template\" alerts=\"$ctrl.alerts\" is-dialog=\"true\"></process-template>\n" +
"<process-template project=\"$ctrl.selectedProject\" template=\"$ctrl.template\" alerts=\"$ctrl.alerts\" is-dialog=\"true\"></process-template>\n" +
"</form>\n" +
"</div>\n" +
"</div>\n" +
Expand Down

0 comments on commit c63e2f5

Please sign in to comment.