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
515e9d51
Commit
515e9d51
authored
9 years ago
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure issue assignee is properly reset.
parent
2953e0d1
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
20 deletions
+12
-20
app/assets/javascripts/project_users_select.js.coffee
app/assets/javascripts/project_users_select.js.coffee
+2
-5
app/helpers/issues_helper.rb
app/helpers/issues_helper.rb
+1
-12
app/services/issues/bulk_update_service.rb
app/services/issues/bulk_update_service.rb
+3
-3
app/services/issues/update_service.rb
app/services/issues/update_service.rb
+3
-0
app/services/merge_requests/update_service.rb
app/services/merge_requests/update_service.rb
+3
-0
No files found.
app/assets/javascripts/project_users_select.js.coffee
View file @
515e9d51
...
@@ -25,7 +25,7 @@ class @ProjectUsersSelect
...
@@ -25,7 +25,7 @@ class @ProjectUsersSelect
initSelection
:
(
element
,
callback
)
->
initSelection
:
(
element
,
callback
)
->
id
=
$
(
element
).
val
()
id
=
$
(
element
).
val
()
if
id
isnt
"
"
if
id
!=
""
&&
id
!=
"-1
"
Api
.
user
(
id
,
callback
)
Api
.
user
(
id
,
callback
)
...
@@ -44,9 +44,6 @@ class @ProjectUsersSelect
...
@@ -44,9 +44,6 @@ class @ProjectUsersSelect
else
else
avatar
=
gon
.
default_avatar_url
avatar
=
gon
.
default_avatar_url
if
user
.
id
==
''
avatarMarkup
=
''
else
avatarMarkup
=
"<div class='user-image'><img class='avatar s24' src='
#{
avatar
}
'></div>"
avatarMarkup
=
"<div class='user-image'><img class='avatar s24' src='
#{
avatar
}
'></div>"
"<div class='user-result'>
"<div class='user-result'>
...
...
This diff is collapsed.
Click to expand it.
app/helpers/issues_helper.rb
View file @
515e9d51
...
@@ -58,22 +58,11 @@ module IssuesHelper
...
@@ -58,22 +58,11 @@ module IssuesHelper
end
end
def
bulk_update_milestone_options
def
bulk_update_milestone_options
options_for_select
([
'None (backlog)'
])
+
options_for_select
([
[
'None (backlog)'
,
-
1
]
])
+
options_from_collection_for_select
(
project_active_milestones
,
'id'
,
options_from_collection_for_select
(
project_active_milestones
,
'id'
,
'title'
,
params
[
:milestone_id
])
'title'
,
params
[
:milestone_id
])
end
end
def
bulk_update_assignee_options
(
project
=
@project
)
options_for_select
([
'None (unassigned)'
])
+
options_from_collection_for_select
(
project
.
team
.
members
,
'id'
,
'name'
,
params
[
:assignee_id
])
end
def
assignee_options
(
object
,
project
=
@project
)
options_from_collection_for_select
(
project
.
team
.
members
.
sort_by
(
&
:name
),
'id'
,
'name'
,
object
.
assignee_id
)
end
def
milestone_options
(
object
)
def
milestone_options
(
object
)
options_from_collection_for_select
(
object
.
project
.
milestones
.
active
,
options_from_collection_for_select
(
object
.
project
.
milestones
.
active
,
'id'
,
'title'
,
object
.
milestone_id
)
'id'
,
'title'
,
object
.
milestone_id
)
...
...
This diff is collapsed.
Click to expand it.
app/services/issues/bulk_update_service.rb
View file @
515e9d51
This diff is collapsed.
Click to expand it.
app/services/issues/update_service.rb
View file @
515e9d51
...
@@ -14,6 +14,9 @@ module Issues
...
@@ -14,6 +14,9 @@ module Issues
issue
.
update_nth_task
(
params
[
:task_num
].
to_i
,
false
)
issue
.
update_nth_task
(
params
[
:task_num
].
to_i
,
false
)
end
end
params
[
:assignee_id
]
=
""
if
params
[
:assignee_id
]
==
"-1"
params
[
:milestone_id
]
=
""
if
params
[
:milestone_id
]
==
"-1"
old_labels
=
issue
.
labels
.
to_a
old_labels
=
issue
.
labels
.
to_a
if
params
.
present?
&&
issue
.
update_attributes
(
params
.
except
(
:state_event
,
if
params
.
present?
&&
issue
.
update_attributes
(
params
.
except
(
:state_event
,
...
...
This diff is collapsed.
Click to expand it.
app/services/merge_requests/update_service.rb
View file @
515e9d51
...
@@ -23,6 +23,9 @@ module MergeRequests
...
@@ -23,6 +23,9 @@ module MergeRequests
merge_request
.
update_nth_task
(
params
[
:task_num
].
to_i
,
false
)
merge_request
.
update_nth_task
(
params
[
:task_num
].
to_i
,
false
)
end
end
params
[
:assignee_id
]
=
""
if
params
[
:assignee_id
]
==
"-1"
params
[
:milestone_id
]
=
""
if
params
[
:milestone_id
]
==
"-1"
old_labels
=
merge_request
.
labels
.
to_a
old_labels
=
merge_request
.
labels
.
to_a
if
params
.
present?
&&
merge_request
.
update_attributes
(
if
params
.
present?
&&
merge_request
.
update_attributes
(
...
...
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