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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
8a26021b
Commit
8a26021b
authored
Nov 18, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix empty stage presentation
parent
6efe1531
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
4 deletions
+11
-4
app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6
.../javascripts/cycle_analytics/cycle_analytics_store.js.es6
+0
-1
app/assets/stylesheets/pages/cycle_analytics.scss
app/assets/stylesheets/pages/cycle_analytics.scss
+4
-0
app/views/projects/cycle_analytics/show.html.haml
app/views/projects/cycle_analytics/show.html.haml
+7
-3
No files found.
app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6
View file @
8a26021b
...
@@ -23,7 +23,6 @@
...
@@ -23,7 +23,6 @@
});
});
newData.stages.forEach((item) => {
newData.stages.forEach((item) => {
item.value = item.value || '- - -';
item.active = false;
item.active = false;
item.component = `stage-${item.title.toLowerCase()}-component`;
item.component = `stage-${item.title.toLowerCase()}-component`;
});
});
...
...
app/assets/stylesheets/pages/cycle_analytics.scss
View file @
8a26021b
...
@@ -246,6 +246,10 @@
...
@@ -246,6 +246,10 @@
.stage-name
{
.stage-name
{
padding-left
:
16px
;
padding-left
:
16px
;
}
}
.stage-empty
{
color
:
$gl-text-color-light
;
}
}
}
}
}
...
...
app/views/projects/cycle_analytics/show.html.haml
View file @
8a26021b
...
@@ -69,15 +69,19 @@
...
@@ -69,15 +69,19 @@
.stage-panel-body
.stage-panel-body
%nav
.stage-nav
%nav
.stage-nav
%ul
%ul
%li
.stage-nav-item
{
':class'
=>
'
{
active:
stage
.
active
}
', '
@click
' => '
selectStage
(
stage
)
'
,
"v-for"
=>
"stage in state.stages"
}
%li
.stage-nav-item
{
':class'
=>
'
{
active:
stage
.
active
}
', '
@click
' => '
selectStage
(
stage
)
'
,
"v-for"
=>
"stage in state.stages"
}
.stage-name
.stage-name
{{ stage.title }}
{{ stage.title }}
.stage-median
.stage-median
%template
{
"v-if"
=>
"stage.value"
}
{{ stage.value }}
{{ stage.value }}
%template
{
"v-else"
=>
true
}
%span
.stage-empty
No enough data
.section.stage-events
.section.stage-events
%template
{
"v-if"
=>
"isLoadingStage"
}
%template
{
"v-if"
=>
"isLoadingStage"
}
=
icon
(
"spinner spin"
,
"v-show"
=>
"isLoadingStage"
)
=
icon
(
"spinner spin"
,
"v-show"
=>
"isLoadingStage"
)
%template
{
"v-if"
=>
"isEmptyStage"
}
%template
{
"v-if"
=>
"isEmptyStage
&& !isLoadingStage
"
}
=
render
partial:
"empty_stage"
=
render
partial:
"empty_stage"
%template
{
"v-if"
=>
"state.events.length && !isLoadingStage && !isEmptyStage"
}
%template
{
"v-if"
=>
"state.events.length && !isLoadingStage && !isEmptyStage"
}
%component
{
":is"
=>
"currentStage.component"
,
":stage"
=>
"currentStage"
,
":items"
=>
"state.events"
}
%component
{
":is"
=>
"currentStage.component"
,
":stage"
=>
"currentStage"
,
":items"
=>
"state.events"
}
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