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
f4089e1e
Commit
f4089e1e
authored
Apr 17, 2019
by
Victor Wu
Committed by
Annabel Dunstone Gray
Apr 17, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace `No due date` with `None`
parent
47005527
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
10 deletions
+7
-10
app/assets/javascripts/due_date_select.js
app/assets/javascripts/due_date_select.js
+2
-2
app/views/shared/boards/components/sidebar/_due_date.html.haml
...iews/shared/boards/components/sidebar/_due_date.html.haml
+1
-1
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+0
-3
spec/features/issues_spec.rb
spec/features/issues_spec.rb
+2
-2
spec/support/shared_examples/quick_actions/issue/remove_due_date_quick_action_shared_examples.rb
...ons/issue/remove_due_date_quick_action_shared_examples.rb
+1
-1
No files found.
app/assets/javascripts/due_date_select.js
View file @
f4089e1e
...
@@ -104,7 +104,7 @@ class DueDateSelect {
...
@@ -104,7 +104,7 @@ class DueDateSelect {
const
dateObj
=
new
Date
(
dateArray
[
0
],
dateArray
[
1
]
-
1
,
dateArray
[
2
]);
const
dateObj
=
new
Date
(
dateArray
[
0
],
dateArray
[
1
]
-
1
,
dateArray
[
2
]);
this
.
displayedDate
=
dateFormat
(
dateObj
,
'
mmm d, yyyy
'
);
this
.
displayedDate
=
dateFormat
(
dateObj
,
'
mmm d, yyyy
'
);
}
else
{
}
else
{
this
.
displayedDate
=
'
No due date
'
;
this
.
displayedDate
=
__
(
'
None
'
)
;
}
}
}
}
...
@@ -132,7 +132,7 @@ class DueDateSelect {
...
@@ -132,7 +132,7 @@ class DueDateSelect {
submitSelectedDate
(
isDropdown
)
{
submitSelectedDate
(
isDropdown
)
{
const
selectedDateValue
=
this
.
datePayload
[
this
.
abilityName
].
due_date
;
const
selectedDateValue
=
this
.
datePayload
[
this
.
abilityName
].
due_date
;
const
hasDueDate
=
this
.
displayedDate
!==
'
No due date
'
;
const
hasDueDate
=
this
.
displayedDate
!==
__
(
'
None
'
)
;
const
displayedDateStyle
=
hasDueDate
?
'
bold
'
:
'
no-value
'
;
const
displayedDateStyle
=
hasDueDate
?
'
bold
'
:
'
no-value
'
;
this
.
$loading
.
removeClass
(
'
hidden
'
).
fadeIn
();
this
.
$loading
.
removeClass
(
'
hidden
'
).
fadeIn
();
...
...
app/views/shared/boards/components/sidebar/_due_date.html.haml
View file @
f4089e1e
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
.value
.value
.value-content
.value-content
%span
.no-value
{
"v-if"
=>
"!issue.dueDate"
}
%span
.no-value
{
"v-if"
=>
"!issue.dueDate"
}
=
_
(
"No
due dat
e"
)
=
_
(
"No
n
e"
)
%span
.bold
{
"v-if"
=>
"issue.dueDate"
}
%span
.bold
{
"v-if"
=>
"issue.dueDate"
}
{{ issue.dueDate | due-date }}
{{ issue.dueDate | due-date }}
-
if
can_admin_issue?
-
if
can_admin_issue?
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
f4089e1e
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
%span
.bold
=
issuable_sidebar
[
:due_date
].
to_s
(
:medium
)
%span
.bold
=
issuable_sidebar
[
:due_date
].
to_s
(
:medium
)
-
else
-
else
%span
.no-value
%span
.no-value
=
_
(
'No
due dat
e'
)
=
_
(
'No
n
e'
)
-
if
can_edit_issuable
-
if
can_edit_issuable
%span
.no-value.js-remove-due-date-holder
{
class:
(
"hidden"
if
issuable_sidebar
[
:due_date
].
nil?
)
}
%span
.no-value.js-remove-due-date-holder
{
class:
(
"hidden"
if
issuable_sidebar
[
:due_date
].
nil?
)
}
\-
\-
...
...
locale/gitlab.pot
View file @
f4089e1e
...
@@ -5966,9 +5966,6 @@ msgstr ""
...
@@ -5966,9 +5966,6 @@ msgstr ""
msgid "No details available"
msgid "No details available"
msgstr ""
msgstr ""
msgid "No due date"
msgstr ""
msgid "No errors to display."
msgid "No errors to display."
msgstr ""
msgstr ""
...
...
spec/features/issues_spec.rb
View file @
f4089e1e
...
@@ -775,10 +775,10 @@ describe 'Issues' do
...
@@ -775,10 +775,10 @@ describe 'Issues' do
wait_for_requests
wait_for_requests
expect
(
page
).
to
have_no_content
'No
due dat
e'
expect
(
page
).
to
have_no_content
'No
n
e'
click_link
'remove due date'
click_link
'remove due date'
expect
(
page
).
to
have_content
'No
due dat
e'
expect
(
page
).
to
have_content
'No
n
e'
end
end
end
end
end
end
...
...
spec/support/shared_examples/quick_actions/issue/remove_due_date_quick_action_shared_examples.rb
View file @
f4089e1e
...
@@ -11,7 +11,7 @@ shared_examples 'remove_due_date quick action' do
...
@@ -11,7 +11,7 @@ shared_examples 'remove_due_date quick action' do
visit
project_issue_path
(
project
,
issue
)
visit
project_issue_path
(
project
,
issue
)
page
.
within
'.due_date'
do
page
.
within
'.due_date'
do
expect
(
page
).
to
have_content
'No
due dat
e'
expect
(
page
).
to
have_content
'No
n
e'
end
end
end
end
end
end
...
...
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