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
f8d183ad
Commit
f8d183ad
authored
Dec 16, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update all references to humanReadable values.
parent
2cf674bb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
17 deletions
+17
-17
app/assets/javascripts/issuable/time_tracking/components/collapsed_state.js.es6
.../issuable/time_tracking/components/collapsed_state.js.es6
+5
-5
app/assets/javascripts/issuable/time_tracking/components/estimate_only_pane.js.es6
...suable/time_tracking/components/estimate_only_pane.js.es6
+2
-2
app/assets/javascripts/issuable/time_tracking/components/spent_only_pane.js.es6
.../issuable/time_tracking/components/spent_only_pane.js.es6
+2
-2
app/assets/javascripts/issuable/time_tracking/components/time_tracker.js.es6
...pts/issuable/time_tracking/components/time_tracker.js.es6
+8
-8
No files found.
app/assets/javascripts/issuable/time_tracking/components/collapsed_state.js.es6
View file @
f8d183ad
...
@@ -9,8 +9,8 @@
...
@@ -9,8 +9,8 @@
'showSpentOnlyState',
'showSpentOnlyState',
'showEstimateOnlyState',
'showEstimateOnlyState',
'showNoTimeTrackingState',
'showNoTimeTrackingState',
'timeSpentHuman',
'timeSpentHuman
Readable
',
'timeEstimateHuman',
'timeEstimateHuman
Readable
',
'stopwatchSvg',
'stopwatchSvg',
],
],
methods: {
methods: {
...
@@ -23,13 +23,13 @@
...
@@ -23,13 +23,13 @@
<div v-html='stopwatchSvg'></div>
<div v-html='stopwatchSvg'></div>
<div class='time-tracking-collapsed-summary'>
<div class='time-tracking-collapsed-summary'>
<div class='compare' v-if='showComparisonState'>
<div class='compare' v-if='showComparisonState'>
<span>{{ abbreviateTime(timeSpentHuman
) }} / {{ abbreviateTime(timeEstimateHuman
) }}</span>
<span>{{ abbreviateTime(timeSpentHuman
Readable) }} / {{ abbreviateTime(timeEstimateHumanReadable
) }}</span>
</div>
</div>
<div class='estimate-only' v-if='showEstimateOnlyState'>
<div class='estimate-only' v-if='showEstimateOnlyState'>
<span class='bold'>-- / {{ abbreviateTime(timeEstimateHuman) }}</span>
<span class='bold'>-- / {{ abbreviateTime(timeEstimateHuman
Readable
) }}</span>
</div>
</div>
<div class='spend-only' v-if='showSpentOnlyState'>
<div class='spend-only' v-if='showSpentOnlyState'>
<span class='bold'>{{ abbreviateTime(timeSpentHuman) }} / --</span>
<span class='bold'>{{ abbreviateTime(timeSpentHuman
Readable
) }} / --</span>
</div>
</div>
<div class='no-tracking' v-if='showNoTimeTrackingState'>
<div class='no-tracking' v-if='showNoTimeTrackingState'>
<span class='no-value'>None</span>
<span class='no-value'>None</span>
...
...
app/assets/javascripts/issuable/time_tracking/components/estimate_only_pane.js.es6
View file @
f8d183ad
...
@@ -2,11 +2,11 @@
...
@@ -2,11 +2,11 @@
(() => {
(() => {
Vue.component('time-tracking-estimate-only-pane', {
Vue.component('time-tracking-estimate-only-pane', {
name: 'time-tracking-estimate-only-pane',
name: 'time-tracking-estimate-only-pane',
props: ['timeEstimateHuman'],
props: ['timeEstimateHuman
Readable
'],
template: `
template: `
<div class='time-tracking-estimate-only-pane'>
<div class='time-tracking-estimate-only-pane'>
<span class='bold'>Estimated:</span>
<span class='bold'>Estimated:</span>
{{ timeEstimateHuman }}
{{ timeEstimateHuman
Readable
}}
</div>
</div>
`,
`,
});
});
...
...
app/assets/javascripts/issuable/time_tracking/components/spent_only_pane.js.es6
View file @
f8d183ad
...
@@ -2,11 +2,11 @@
...
@@ -2,11 +2,11 @@
(() => {
(() => {
Vue.component('time-tracking-spent-only-pane', {
Vue.component('time-tracking-spent-only-pane', {
name: 'time-tracking-spent-only-pane',
name: 'time-tracking-spent-only-pane',
props: ['timeSpentHuman'],
props: ['timeSpentHuman
Readable
'],
template: `
template: `
<div class='time-tracking-spend-only-pane'>
<div class='time-tracking-spend-only-pane'>
<span class='bold'>Spent:</span>
<span class='bold'>Spent:</span>
{{ timeSpentHuman }}
{{ timeSpentHuman
Readable
}}
</div>
</div>
`,
`,
});
});
...
...
app/assets/javascripts/issuable/time_tracking/components/time_tracker.js.es6
View file @
f8d183ad
...
@@ -29,10 +29,10 @@
...
@@ -29,10 +29,10 @@
timeEstimate() {
timeEstimate() {
return this.time_estimate;
return this.time_estimate;
},
},
timeEstimateHuman() {
timeEstimateHuman
Readable
() {
return this.human_time_estimate;
return this.human_time_estimate;
},
},
timeSpentHuman() {
timeSpentHuman
Readable
() {
return this.human_time_spent;
return this.human_time_spent;
},
},
hasTimeSpent() {
hasTimeSpent() {
...
@@ -69,8 +69,8 @@
...
@@ -69,8 +69,8 @@
:show-help-state='showHelpState'
:show-help-state='showHelpState'
:show-spent-only-state='showSpentOnlyState'
:show-spent-only-state='showSpentOnlyState'
:show-estimate-only-state='showEstimateOnlyState'
:show-estimate-only-state='showEstimateOnlyState'
:time-spent-human
='timeSpentHuman
'
:time-spent-human
-readable='timeSpentHumanReadable
'
:time-estimate-human
='timeEstimateHuman
'
:time-estimate-human
-readable='timeEstimateHumanReadable
'
:stopwatch-svg='stopwatchSvg'>
:stopwatch-svg='stopwatchSvg'>
</time-tracking-collapsed-state>
</time-tracking-collapsed-state>
<div class='title hide-collapsed'>
<div class='title hide-collapsed'>
...
@@ -89,11 +89,11 @@
...
@@ -89,11 +89,11 @@
<div class='time-tracking-content hide-collapsed'>
<div class='time-tracking-content hide-collapsed'>
<time-tracking-estimate-only-pane
<time-tracking-estimate-only-pane
v-if='showEstimateOnlyState'
v-if='showEstimateOnlyState'
:time-estimate-human
='timeEstimateHuman
'>
:time-estimate-human
-readable='timeEstimateHumanReadable
'>
</time-tracking-estimate-only-pane>
</time-tracking-estimate-only-pane>
<time-tracking-spent-only-pane
<time-tracking-spent-only-pane
v-if='showSpentOnlyState'
v-if='showSpentOnlyState'
:time-spent-human
='timeSpentHuman
'>
:time-spent-human
-readable='timeSpentHumanReadable
'>
</time-tracking-spent-only-pane>
</time-tracking-spent-only-pane>
<time-tracking-no-tracking-pane
<time-tracking-no-tracking-pane
v-if='showNoTimeTrackingState'>
v-if='showNoTimeTrackingState'>
...
@@ -102,8 +102,8 @@
...
@@ -102,8 +102,8 @@
v-if='showComparisonState'
v-if='showComparisonState'
:time-estimate='timeEstimate'
:time-estimate='timeEstimate'
:time-spent='timeSpent'
:time-spent='timeSpent'
:time-spent-human
='timeSpentHuman
'
:time-spent-human
-readable='timeSpentHumanReadable
'
:time-estimate-human
='timeEstimateHuman
'>
:time-estimate-human
-readable='timeEstimateHumanReadable
'>
</time-tracking-comparison-pane>
</time-tracking-comparison-pane>
<transition name='help-state-toggle'>
<transition name='help-state-toggle'>
<time-tracking-help-state
<time-tracking-help-state
...
...
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