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
14d04f3b
Commit
14d04f3b
authored
Jun 19, 2018
by
Kushal Pandya
Committed by
Jarka Kadlecová
Jul 03, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ci skip] Add group dropdown to todos
parent
50b326a0
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
35 additions
and
20 deletions
+35
-20
app/views/dashboard/todos/index.html.haml
app/views/dashboard/todos/index.html.haml
+1
-20
app/views/shared/dashboard/_todo_filter_actions_dropdown.html.haml
.../shared/dashboard/_todo_filter_actions_dropdown.html.haml
+5
-0
app/views/shared/dashboard/_todo_filter_dropdowns.html.haml
app/views/shared/dashboard/_todo_filter_dropdowns.html.haml
+4
-0
app/views/shared/dashboard/_todo_filter_project_dropdown.html.haml
.../shared/dashboard/_todo_filter_project_dropdown.html.haml
+5
-0
app/views/shared/dashboard/_todo_filter_types_dropdown.html.haml
...ws/shared/dashboard/_todo_filter_types_dropdown.html.haml
+5
-0
app/views/shared/dashboard/_todo_filter_user_dropdown.html.haml
...ews/shared/dashboard/_todo_filter_user_dropdown.html.haml
+5
-0
ee/app/views/shared/dashboard/_todo_filter_dropdowns.html.haml
...p/views/shared/dashboard/_todo_filter_dropdowns.html.haml
+5
-0
ee/app/views/shared/dashboard/_todo_filter_group_dropdown.html.haml
...ws/shared/dashboard/_todo_filter_group_dropdown.html.haml
+5
-0
No files found.
app/views/dashboard/todos/index.html.haml
View file @
14d04f3b
...
...
@@ -31,26 +31,7 @@
.todos-filters
.row-content-block.second-block
=
form_tag
todos_filter_path
(
without:
[
:project_id
,
:author_id
,
:type
,
:action_id
]),
method: :get
,
class:
'filter-form'
do
.filter-item.inline
-
if
params
[
:project_id
].
present?
=
hidden_field_tag
(
:project_id
,
params
[
:project_id
])
=
dropdown_tag
(
project_dropdown_label
(
params
[
:project_id
],
'Project'
),
options:
{
toggle_class:
'js-project-search js-filter-submit'
,
title:
'Filter by project'
,
filter:
true
,
filterInput:
'input#project-search'
,
dropdown_class:
'dropdown-menu-selectable dropdown-menu-project js-filter-submit'
,
placeholder:
'Search projects'
,
data:
{
data:
todo_projects_options
,
default_label:
'Project'
,
display:
'static'
}
})
.filter-item.inline
-
if
params
[
:author_id
].
present?
=
hidden_field_tag
(
:author_id
,
params
[
:author_id
])
=
dropdown_tag
(
user_dropdown_label
(
params
[
:author_id
],
'Author'
),
options:
{
toggle_class:
'js-user-search js-filter-submit js-author-search'
,
title:
'Filter by author'
,
filter:
true
,
filterInput:
'input#author-search'
,
dropdown_class:
'dropdown-menu-user dropdown-menu-selectable dropdown-menu-author js-filter-submit'
,
placeholder:
'Search authors'
,
data:
{
any_user:
'Any Author'
,
first_user:
(
current_user
.
username
if
current_user
),
project_id:
(
@project
.
id
if
@project
),
selected:
params
[
:author_id
],
field_name:
'author_id'
,
default_label:
'Author'
,
todo_filter:
true
,
todo_state_filter:
params
[
:state
]
||
'pending'
}
})
.filter-item.inline
-
if
params
[
:type
].
present?
=
hidden_field_tag
(
:type
,
params
[
:type
])
=
dropdown_tag
(
todo_types_dropdown_label
(
params
[
:type
],
'Type'
),
options:
{
toggle_class:
'js-type-search js-filter-submit'
,
dropdown_class:
'dropdown-menu-selectable dropdown-menu-type js-filter-submit'
,
data:
{
data:
todo_types_options
,
default_label:
'Type'
}
})
.filter-item.inline.actions-filter
-
if
params
[
:action_id
].
present?
=
hidden_field_tag
(
:action_id
,
params
[
:action_id
])
=
dropdown_tag
(
todo_actions_dropdown_label
(
params
[
:action_id
],
'Action'
),
options:
{
toggle_class:
'js-action-search js-filter-submit'
,
dropdown_class:
'dropdown-menu-selectable dropdown-menu-action js-filter-submit'
,
data:
{
data:
todo_actions_options
,
default_label:
'Action'
}
})
=
render_if_exists
'shared/dashboard/todo_filter_dropdowns'
.filter-item.sort-filter
.dropdown
%button
.dropdown-menu-toggle.dropdown-menu-toggle-sort
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
...
...
app/views/shared/dashboard/_todo_filter_actions_dropdown.html.haml
0 → 100644
View file @
14d04f3b
.filter-item.inline.actions-filter
-
if
params
[
:action_id
].
present?
=
hidden_field_tag
(
:action_id
,
params
[
:action_id
])
=
dropdown_tag
(
todo_actions_dropdown_label
(
params
[
:action_id
],
'Action'
),
options:
{
toggle_class:
'js-action-search js-filter-submit'
,
dropdown_class:
'dropdown-menu-selectable dropdown-menu-action js-filter-submit'
,
data:
{
data:
todo_actions_options
,
default_label:
'Action'
}
})
app/views/shared/dashboard/_todo_filter_dropdowns.html.haml
0 → 100644
View file @
14d04f3b
=
render
'shared/dashboard/todo_filter_project_dropdown'
=
render
'shared/dashboard/todo_filter_user_dropdown'
=
render
'shared/dashboard/todo_filter_types_dropdown'
=
render
'shared/dashboard/todo_filter_actions_dropdown'
app/views/shared/dashboard/_todo_filter_project_dropdown.html.haml
0 → 100644
View file @
14d04f3b
.filter-item.inline
-
if
params
[
:project_id
].
present?
=
hidden_field_tag
(
:project_id
,
params
[
:project_id
])
=
dropdown_tag
(
project_dropdown_label
(
params
[
:project_id
],
'Project'
),
options:
{
toggle_class:
'js-project-search js-filter-submit'
,
title:
'Filter by project'
,
filter:
true
,
filterInput:
'input#project-search'
,
dropdown_class:
'dropdown-menu-selectable dropdown-menu-project js-filter-submit'
,
placeholder:
'Search projects'
,
data:
{
data:
todo_projects_options
,
default_label:
'Project'
,
display:
'static'
}
})
app/views/shared/dashboard/_todo_filter_types_dropdown.html.haml
0 → 100644
View file @
14d04f3b
.filter-item.inline
-
if
params
[
:type
].
present?
=
hidden_field_tag
(
:type
,
params
[
:type
])
=
dropdown_tag
(
todo_types_dropdown_label
(
params
[
:type
],
'Type'
),
options:
{
toggle_class:
'js-type-search js-filter-submit'
,
dropdown_class:
'dropdown-menu-selectable dropdown-menu-type js-filter-submit'
,
data:
{
data:
todo_types_options
,
default_label:
'Type'
}
})
app/views/shared/dashboard/_todo_filter_user_dropdown.html.haml
0 → 100644
View file @
14d04f3b
.filter-item.inline
-
if
params
[
:author_id
].
present?
=
hidden_field_tag
(
:author_id
,
params
[
:author_id
])
=
dropdown_tag
(
user_dropdown_label
(
params
[
:author_id
],
'Author'
),
options:
{
toggle_class:
'js-user-search js-filter-submit js-author-search'
,
title:
'Filter by author'
,
filter:
true
,
filterInput:
'input#author-search'
,
dropdown_class:
'dropdown-menu-user dropdown-menu-selectable dropdown-menu-author js-filter-submit'
,
placeholder:
'Search authors'
,
data:
{
any_user:
'Any Author'
,
first_user:
(
current_user
.
username
if
current_user
),
project_id:
(
@project
.
id
if
@project
),
selected:
params
[
:author_id
],
field_name:
'author_id'
,
default_label:
'Author'
,
todo_filter:
true
,
todo_state_filter:
params
[
:state
]
||
'pending'
}
})
ee/app/views/shared/dashboard/_todo_filter_dropdowns.html.haml
0 → 100644
View file @
14d04f3b
=
render
'shared/dashboard/todo_filter_group_dropdown'
=
render
'shared/dashboard/todo_filter_project_dropdown'
=
render
'shared/dashboard/todo_filter_user_dropdown'
=
render
'shared/dashboard/todo_filter_types_dropdown'
=
render
'shared/dashboard/todo_filter_actions_dropdown'
ee/app/views/shared/dashboard/_todo_filter_group_dropdown.html.haml
0 → 100644
View file @
14d04f3b
.filter-item.inline
-
if
params
[
:group_id
].
present?
=
hidden_field_tag
(
:group_id
,
params
[
:group_id
])
=
dropdown_tag
(
project_dropdown_label
(
params
[
:group_id
],
'Group'
),
options:
{
toggle_class:
'js-group-search js-filter-submit'
,
title:
'Filter by group'
,
filter:
true
,
filterInput:
'input#group-search'
,
dropdown_class:
'dropdown-menu-selectable dropdown-menu-group js-filter-submit'
,
placeholder:
'Search groups'
,
data:
{
data:
todo_projects_options
,
default_label:
'Group'
,
display:
'static'
}
})
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