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
Boxiang Sun
gitlab-ce
Commits
922b38a0
Commit
922b38a0
authored
8 years ago
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed inline JS and improved dropdown labels
parent
f157a9e5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
73 additions
and
52 deletions
+73
-52
app/assets/javascripts/todos.js
app/assets/javascripts/todos.js
+56
-0
app/helpers/todos_helper.rb
app/helpers/todos_helper.rb
+13
-3
app/views/dashboard/todos/index.html.haml
app/views/dashboard/todos/index.html.haml
+4
-49
No files found.
app/assets/javascripts/todos.js
View file @
922b38a0
...
@@ -13,6 +13,7 @@
...
@@ -13,6 +13,7 @@
this
.
perPage
=
this
.
el
.
data
(
'
perPage
'
);
this
.
perPage
=
this
.
el
.
data
(
'
perPage
'
);
this
.
clearListeners
();
this
.
clearListeners
();
this
.
initBtnListeners
();
this
.
initBtnListeners
();
this
.
initFilters
();
}
}
Todos
.
prototype
.
clearListeners
=
function
()
{
Todos
.
prototype
.
clearListeners
=
function
()
{
...
@@ -27,6 +28,61 @@
...
@@ -27,6 +28,61 @@
return
$
(
'
.todo
'
).
on
(
'
click
'
,
this
.
goToTodoUrl
);
return
$
(
'
.todo
'
).
on
(
'
click
'
,
this
.
goToTodoUrl
);
};
};
Todos
.
prototype
.
initFilters
=
function
()
{
new
UsersSelect
();
this
.
initProjectFilterDropdown
();
this
.
initTypeFilterDropdown
();
this
.
initActionFilterDropdown
();
$
(
'
form.filter-form
'
).
on
(
'
submit
'
,
function
(
event
)
{
event
.
preventDefault
();
Turbolinks
.
visit
(
this
.
action
+
'
&
'
+
$
(
this
).
serialize
());
});
};
Todos
.
prototype
.
initProjectFilterDropdown
=
function
()
{
$projectDropdown
=
$
(
'
.js-project-search
'
);
$projectDropdown
.
glDropdown
({
filterable
:
true
,
selectable
:
true
,
fieldName
:
'
project_id
'
,
data
:
$projectDropdown
.
data
(
'
data
'
),
clicked
:
function
()
{
if
(
$projectDropdown
.
hasClass
(
'
js-filter-submit
'
))
{
return
$projectDropdown
.
closest
(
'
form.filter-form
'
).
submit
();
}
}
});
};
Todos
.
prototype
.
initTypeFilterDropdown
=
function
()
{
$typeDropdown
=
$
(
'
.js-type-search
'
);
$typeDropdown
.
glDropdown
({
selectable
:
true
,
fieldName
:
'
type
'
,
data
:
$typeDropdown
.
data
(
'
data
'
),
clicked
:
function
()
{
if
(
$typeDropdown
.
hasClass
(
'
js-filter-submit
'
))
{
return
$typeDropdown
.
closest
(
'
form.filter-form
'
).
submit
();
}
}
});
};
Todos
.
prototype
.
initActionFilterDropdown
=
function
()
{
$actionDropdown
=
$
(
'
.js-action-search
'
);
$actionDropdown
.
glDropdown
({
selectable
:
true
,
fieldName
:
'
action_id
'
,
data
:
$actionDropdown
.
data
(
'
data
'
),
clicked
:
function
()
{
if
(
$actionDropdown
.
hasClass
(
'
js-filter-submit
'
))
{
return
$actionDropdown
.
closest
(
'
form.filter-form
'
).
submit
();
}
}
});
};
Todos
.
prototype
.
doneClicked
=
function
(
e
)
{
Todos
.
prototype
.
doneClicked
=
function
(
e
)
{
var
$this
;
var
$this
;
e
.
preventDefault
();
e
.
preventDefault
();
...
...
This diff is collapsed.
Click to expand it.
app/helpers/todos_helper.rb
View file @
922b38a0
...
@@ -98,12 +98,22 @@ module TodosHelper
...
@@ -98,12 +98,22 @@ module TodosHelper
def
todo_types_options
def
todo_types_options
[
[
{
text:
'Any Type'
,
id:
'
'
},
{
id:
''
,
text:
'Any Type
'
},
{
text:
'Issue'
,
id
:
'Issue'
},
{
id:
'Issue'
,
text
:
'Issue'
},
{
text:
'Merge Request'
,
id:
'Merge
Request'
}
{
id:
'MergeRequest'
,
text:
'Merge
Request'
}
]
]
end
end
def
todo_actions_dropdown_label
(
selected_action_id
,
default_action
)
selected_action
=
todo_actions_options
.
find
{
|
action
|
action
[
:id
]
==
selected_action_id
.
to_i
}
selected_action
?
selected_action
[
:text
]
:
default_action
end
def
todo_types_dropdown_label
(
selected_type
,
default_type
)
selected_type
=
todo_types_options
.
find
{
|
type
|
type
[
:id
]
==
selected_type
&&
type
[
:id
]
!=
''
}
selected_type
?
selected_type
[
:text
]
:
default_type
end
private
private
def
show_todo_state?
(
todo
)
def
show_todo_state?
(
todo
)
...
...
This diff is collapsed.
Click to expand it.
app/views/dashboard/todos/index.html.haml
View file @
922b38a0
...
@@ -40,13 +40,13 @@
...
@@ -40,13 +40,13 @@
.filter-item.inline
.filter-item.inline
-
if
params
[
:type
].
present?
-
if
params
[
:type
].
present?
=
hidden_field_tag
(
:type
,
params
[
:type
])
=
hidden_field_tag
(
:type
,
params
[
:type
])
=
dropdown_tag
(
params
[
:type
]
||
'Type'
,
options:
{
toggle_class:
'js-type-search js-filter-submit'
,
dropdown_class:
'dropdown-menu-selectable dropdown-menu-type js-filter-submit'
,
=
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
,
selected:
params
[
:type
],
field_name:
'type'
,
default_label:
'Type'
}
})
data:
{
data:
todo_types_options
}
})
.filter-item.inline.actions-filter
.filter-item.inline.actions-filter
-
if
params
[
:action_id
].
present?
-
if
params
[
:action_id
].
present?
=
hidden_field_tag
(
:action_id
,
params
[
:action_id
])
=
hidden_field_tag
(
:action_id
,
params
[
:action_id
])
=
dropdown_tag
(
params
[
:action_id
]
||
'Action'
,
options:
{
toggle_class:
'js-action-search js-filter-submit'
,
dropdown_class:
'dropdown-menu-selectable dropdown-menu-action js-filter-submit'
,
=
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
,
selected:
params
[
:action_id
],
field_name:
'action_id'
,
default_label:
'Action'
}
})
data:
{
data:
todo_actions_options
}
})
.pull-right
.pull-right
.dropdown.inline.prepend-left-10
.dropdown.inline.prepend-left-10
%button
.dropdown-toggle.btn
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%button
.dropdown-toggle.btn
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
...
@@ -80,48 +80,3 @@
...
@@ -80,48 +80,3 @@
=
paginate
@todos
,
theme:
"gitlab"
=
paginate
@todos
,
theme:
"gitlab"
-
else
-
else
.nothing-here-block
You're all done!
.nothing-here-block
You're all done!
:javascript
new
UsersSelect
();
$projectDropdown
=
$
(
'
.js-project-search
'
);
$projectDropdown
.
glDropdown
({
filterable
:
true
,
selectable
:
true
,
fieldName
:
'
project_id
'
,
data
:
$projectDropdown
.
data
(
'
data
'
),
clicked
:
function
()
{
if
(
$projectDropdown
.
hasClass
(
'
js-filter-submit
'
))
{
return
$projectDropdown
.
closest
(
'
form
'
).
submit
();
}
}
});
$typeDropdown
=
$
(
'
.js-type-search
'
);
$typeDropdown
.
glDropdown
({
selectable
:
true
,
fieldName
:
'
type_id
'
,
data
:
$typeDropdown
.
data
(
'
data
'
),
clicked
:
function
()
{
if
(
$typeDropdown
.
hasClass
(
'
js-filter-submit
'
))
{
return
$typeDropdown
.
closest
(
'
form
'
).
submit
();
}
}
});
$actionDropdown
=
$
(
'
.js-action-search
'
);
$actionDropdown
.
glDropdown
({
selectable
:
true
,
fieldName
:
'
action_id
'
,
data
:
$actionDropdown
.
data
(
'
data
'
),
clicked
:
function
()
{
if
(
$actionDropdown
.
hasClass
(
'
js-filter-submit
'
))
{
return
$actionDropdown
.
closest
(
'
form
'
).
submit
();
}
}
});
$
(
'
form.filter-form
'
).
on
(
'
submit
'
,
function
(
event
)
{
event
.
preventDefault
();
Turbolinks
.
visit
(
this
.
action
+
'
&
'
+
$
(
this
).
serialize
());
});
This diff is collapsed.
Click to expand it.
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