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
a88097b1
Commit
a88097b1
authored
Jun 26, 2018
by
Kushal Pandya
Committed by
Jarka Kadlecová
Jul 03, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ci skip] Update todos dropdown
parent
f7de209a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
29 additions
and
14 deletions
+29
-14
app/assets/javascripts/pages/dashboard/todos/index/todos.js
app/assets/javascripts/pages/dashboard/todos/index/todos.js
+11
-8
app/assets/javascripts/sidebar/components/todo_toggle/todo.vue
...ssets/javascripts/sidebar/components/todo_toggle/todo.vue
+5
-5
ee/app/assets/javascripts/epics/epic_show/components/epic_show_app.vue
.../javascripts/epics/epic_show/components/epic_show_app.vue
+5
-0
ee/app/assets/javascripts/epics/epic_show/epic_show_bundle.js
...pp/assets/javascripts/epics/epic_show/epic_show_bundle.js
+1
-0
ee/app/assets/javascripts/epics/sidebar/components/sidebar_app.vue
...sets/javascripts/epics/sidebar/components/sidebar_app.vue
+6
-0
ee/app/helpers/ee/issuables_helper.rb
ee/app/helpers/ee/issuables_helper.rb
+1
-1
No files found.
app/assets/javascripts/pages/dashboard/todos/index/todos.js
View file @
a88097b1
...
...
@@ -39,6 +39,7 @@ export default class Todos {
}
initFilters
()
{
this
.
initFilterDropdown
(
$
(
'
.js-group-search
'
),
'
group_id
'
,
[
'
text
'
]);
this
.
initFilterDropdown
(
$
(
'
.js-project-search
'
),
'
project_id
'
,
[
'
text
'
]);
this
.
initFilterDropdown
(
$
(
'
.js-type-search
'
),
'
type
'
);
this
.
initFilterDropdown
(
$
(
'
.js-action-search
'
),
'
action_id
'
);
...
...
@@ -47,14 +48,16 @@ export default class Todos {
}
initFilterDropdown
(
$dropdown
,
fieldName
,
searchFields
)
{
$dropdown
.
glDropdown
({
fieldName
,
selectable
:
true
,
filterable
:
searchFields
?
true
:
false
,
search
:
{
fields
:
searchFields
},
data
:
$dropdown
.
data
(
'
data
'
),
clicked
:
()
=>
$dropdown
.
closest
(
'
form.filter-form
'
).
submit
(),
});
if
(
$dropdown
.
length
)
{
$dropdown
.
glDropdown
({
fieldName
,
selectable
:
true
,
filterable
:
searchFields
?
true
:
false
,
search
:
{
fields
:
searchFields
},
data
:
$dropdown
.
data
(
'
data
'
),
clicked
:
()
=>
$dropdown
.
closest
(
'
form.filter-form
'
).
submit
(),
});
}
}
updateRowStateClicked
(
e
)
{
...
...
app/assets/javascripts/sidebar/components/todo_toggle/todo.vue
View file @
a88097b1
...
...
@@ -25,7 +25,7 @@ export default {
type
:
String
,
required
:
true
,
},
is
Add
Todo
:
{
isTodo
:
{
type
:
Boolean
,
required
:
false
,
default
:
true
,
...
...
@@ -38,7 +38,7 @@ export default {
},
data
()
{
return
{
isButtonType
AddTodo
:
this
.
isAdd
Todo
,
isButtonType
Todo
:
this
.
is
Todo
,
isActionActive
:
false
,
};
},
...
...
@@ -49,13 +49,13 @@ export default {
'
btn btn-default btn-todo issuable-header-btn float-right
'
;
},
buttonLabel
()
{
return
this
.
isButtonType
Add
Todo
?
MARK_TEXT
:
TODO_TEXT
;
return
this
.
isButtonTypeTodo
?
MARK_TEXT
:
TODO_TEXT
;
},
collapsedButtonIconClasses
()
{
return
this
.
isButtonType
Add
Todo
?
'
todo-undone
'
:
''
;
return
this
.
isButtonTypeTodo
?
'
todo-undone
'
:
''
;
},
collapsedButtonIcon
()
{
return
this
.
isButtonType
Add
Todo
?
'
check-circle
'
:
'
plus-square
'
;
return
this
.
isButtonTypeTodo
?
'
check-circle
'
:
'
plus-square
'
;
},
},
};
...
...
ee/app/assets/javascripts/epics/epic_show/components/epic_show_app.vue
View file @
a88097b1
...
...
@@ -102,6 +102,10 @@
type
:
Boolean
,
required
:
true
,
},
todoExists
:
{
type
:
Boolean
,
required
:
true
,
},
namespace
:
{
type
:
String
,
required
:
false
,
...
...
@@ -182,6 +186,7 @@
:initial-labels=
"labels"
:initial-participants=
"participants"
:initial-subscribed=
"subscribed"
:initial-todo-exists=
"todoExists"
:namespace=
"namespace"
:update-path=
"updateEndpoint"
:labels-path=
"labelsPath"
...
...
ee/app/assets/javascripts/epics/epic_show/epic_show_bundle.js
View file @
a88097b1
...
...
@@ -10,6 +10,7 @@ export default () => {
// Convert backend casing to match frontend style guide
props
.
epicId
=
props
.
epic_id
;
props
.
todoExists
=
props
.
todo_exists
;
props
.
startDate
=
props
.
start_date
;
props
.
endDate
=
props
.
end_date
;
...
...
ee/app/assets/javascripts/epics/sidebar/components/sidebar_app.vue
View file @
a88097b1
...
...
@@ -61,6 +61,10 @@ export default {
type
:
Boolean
,
required
:
true
,
},
initialTodoExists
:
{
type
:
Boolean
,
required
:
true
,
},
namespace
:
{
type
:
String
,
required
:
false
,
...
...
@@ -222,6 +226,7 @@ export default {
v-if=
"!collapsed"
:collapsed=
"collapsed"
:issuable-id=
"epicId"
:is-todo=
"initialTodoExists"
issuable-type=
"epic"
/>
</div>
...
...
@@ -232,6 +237,7 @@ export default {
<sidebar-todo
:collapsed=
"collapsed"
:issuable-id=
"epicId"
:is-todo=
"initialTodoExists"
issuable-type=
"epic"
/>
</div>
...
...
ee/app/helpers/ee/issuables_helper.rb
View file @
a88097b1
...
...
@@ -14,7 +14,7 @@ module EE
return
default_label
if
group_id
.
nil?
return
"Any group"
if
group_id
==
"0"
group
=
Group
.
find_by
(
id:
group_id
)
group
=
::
Group
.
find_by
(
id:
group_id
)
if
group
group
.
full_name
...
...
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