Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
02f99fee
Commit
02f99fee
authored
Nov 06, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
I18n general app error and update attributes from review
parent
f4fb0340
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
10 deletions
+20
-10
app/assets/javascripts/clusters/components/application_row.vue
...ssets/javascripts/clusters/components/application_row.vue
+18
-8
app/assets/javascripts/clusters/components/applications.vue
app/assets/javascripts/clusters/components/applications.vue
+2
-2
No files found.
app/assets/javascripts/clusters/components/application_row.vue
View file @
02f99fee
<
script
>
import
{
s__
}
from
'
../../locale
'
;
import
{
s__
,
sprintf
}
from
'
../../locale
'
;
import
eventHub
from
'
../event_hub
'
;
import
loadingButton
from
'
../../vue_shared/components/loading_button.vue
'
;
import
{
...
...
@@ -56,9 +56,6 @@ export default {
rowJsClass
()
{
return
`js-cluster-application-row-
${
this
.
id
}
`
;
},
titleElementType
()
{
return
this
.
titleLink
?
'
a
'
:
'
span
'
;
},
installButtonLoading
()
{
return
!
this
.
status
||
this
.
status
===
APPLICATION_SCHEDULED
||
...
...
@@ -92,6 +89,13 @@ export default {
hasError
()
{
return
this
.
status
===
APPLICATION_ERROR
||
this
.
requestStatus
===
REQUEST_FAILURE
;
},
generalErrorDescription
()
{
return
sprintf
(
s__
(
'
ClusterIntegration|Something went wrong while installing %{title}
'
),
{
title
:
this
.
title
,
},
);
}
},
methods
:
{
installClicked
()
{
...
...
@@ -110,8 +114,8 @@ export default {
class=
"gl-responsive-table-row-layout"
role=
"row"
>
<
component
:is=
"titleElementType
"
<
a
v-if=
"titleLink
"
:href=
"titleLink"
target=
"blank"
rel=
"noopener noreferrer"
...
...
@@ -119,7 +123,13 @@ export default {
class=
"table-section section-15 section-align-top js-cluster-application-title"
>
{{
title
}}
</component>
</a>
<span
v-else
class=
"table-section section-15 section-align-top js-cluster-application-title"
>
{{
title
}}
</span>
<div
class=
"table-section section-wrap"
role=
"gridcell"
...
...
@@ -152,7 +162,7 @@ export default {
>
<div>
<p
class=
"js-cluster-application-general-error-message"
>
Something went wrong while installing
{{
title
}}
{{
generalErrorDescription
}}
</p>
<ul
v-if=
"statusReason || requestReason"
>
<li
...
...
app/assets/javascripts/clusters/components/applications.vue
View file @
02f99fee
...
...
@@ -45,7 +45,7 @@ export default {
const
extraCostParagraph
=
sprintf
(
_
.
escape
(
s__
(
'
ClusterIntegration|%{boldNotice} This will add some extra resources like a load balancer, which incur additional costs. See %{pricingLink}
'
)),
{
boldNotice
:
`<strong>
${
_
.
escape
(
s__
(
'
ClusterIntegration|Note:
'
))}
</strong>`
,
pricingLink
:
`<a href="https://cloud.google.com/compute/pricing#lb" target="blank" rel="noopener noreferrer">
pricingLink
:
`<a href="https://cloud.google.com/compute/pricing#lb" target="
_
blank" rel="noopener noreferrer">
${
_
.
escape
(
s__
(
'
ClusterIntegration|GKE pricing
'
))}
</a>`
,
},
...
...
@@ -85,7 +85,7 @@ export default {
</div>
<div
class=
"settings-content"
>
<div
class=
"
form_group
append-bottom-20"
>
<div
class=
"append-bottom-20"
>
<application-row
id=
"helm"
:title=
"applications.helm.title"
...
...
Write
Preview
Markdown
is supported
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