Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Nomad
Commits
a9707411
Commit
a9707411
authored
6 years ago
by
Michael Lange
Browse files
Options
Download
Email Patches
Plain Diff
Move the Diff property read out of the template
parent
f29f4351
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ui/app/controllers/jobs/run.js
+3
-1
ui/app/controllers/jobs/run.js
ui/app/templates/jobs/run.hbs
+1
-1
ui/app/templates/jobs/run.hbs
with
4 additions
and
2 deletions
+4
-2
ui/app/controllers/jobs/run.js
+
3
-
1
View file @
a9707411
...
...
@@ -9,6 +9,8 @@ export default Controller.extend({
planError
:
null
,
runError
:
null
,
planOutput
:
null
,
showPlanMessage
:
localStorageProperty
(
'
nomadMessageJobPlan
'
,
true
),
showEditorMessage
:
localStorageProperty
(
'
nomadMessageJobEditor
'
,
true
),
...
...
@@ -29,7 +31,7 @@ export default Controller.extend({
try
{
const
planOutput
=
yield
this
.
get
(
'
model
'
).
plan
();
this
.
set
(
'
planOutput
'
,
planOutput
);
this
.
set
(
'
planOutput
'
,
planOutput
.
Diff
);
}
catch
(
err
)
{
const
error
=
messageFromAdapterError
(
err
)
||
'
Could not plan job
'
;
this
.
set
(
'
planError
'
,
error
);
...
...
This diff is collapsed.
Click to expand it.
ui/app/templates/jobs/run.hbs
+
1
-
1
View file @
a9707411
...
...
@@ -70,7 +70,7 @@
<div
class=
"boxed-section"
>
<div
class=
"boxed-section-head"
>
Job Plan
</div>
<div
class=
"boxed-section-body is-dark"
>
{{
job-diff
diff
=
planOutput
.
Diff
}}
{{
job-diff
diff
=
planOutput
}}
</div>
</div>
<div
class=
"content is-associative"
>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help