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
Jérome Perrin
gitlab-ce
Commits
530aae90
Commit
530aae90
authored
Oct 17, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Abstract LabelPriority away into methods on Label model
parent
074c9649
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
79 additions
and
9 deletions
+79
-9
app/controllers/projects/labels_controller.rb
app/controllers/projects/labels_controller.rb
+6
-8
app/models/label.rb
app/models/label.rb
+15
-1
spec/models/label_spec.rb
spec/models/label_spec.rb
+58
-0
No files found.
app/controllers/projects/labels_controller.rb
View file @
530aae90
...
@@ -84,7 +84,7 @@ class Projects::LabelsController < Projects::ApplicationController
...
@@ -84,7 +84,7 @@ class Projects::LabelsController < Projects::ApplicationController
respond_to
do
|
format
|
respond_to
do
|
format
|
label
=
@available_labels
.
find
(
params
[
:id
])
label
=
@available_labels
.
find
(
params
[
:id
])
if
label
.
priorities
.
where
(
project_id:
project
).
delete_all
if
label
.
unprioritize!
(
project
)
format
.
json
{
render
json:
label
}
format
.
json
{
render
json:
label
}
else
else
format
.
json
{
head
:unprocessable_entity
}
format
.
json
{
head
:unprocessable_entity
}
...
@@ -94,14 +94,12 @@ class Projects::LabelsController < Projects::ApplicationController
...
@@ -94,14 +94,12 @@ class Projects::LabelsController < Projects::ApplicationController
def
set_priorities
def
set_priorities
Label
.
transaction
do
Label
.
transaction
do
label_ids
=
@available_labels
.
where
(
id:
params
[
:label_ids
]).
pluck
(
:id
)
available_labels_ids
=
@available_labels
.
where
(
id:
params
[
:label_ids
]).
pluck
(
:id
)
label_ids
=
params
[
:label_ids
].
select
{
|
id
|
available_labels_ids
.
include?
(
id
.
to_i
)
}
params
[
:label_ids
].
each_with_index
do
|
label_id
,
index
|
label_ids
.
each_with_index
do
|
label_id
,
index
|
next
unless
label_ids
.
include?
(
label_id
.
to_i
)
label
=
@available_labels
.
find
(
label_id
)
label
.
prioritize!
(
project
,
index
)
label_priority
=
LabelPriority
.
find_or_initialize_by
(
project_id:
@project
.
id
,
label_id:
label_id
)
label_priority
.
priority
=
index
label_priority
.
save!
end
end
end
end
...
...
app/models/label.rb
View file @
530aae90
...
@@ -97,6 +97,20 @@ class Label < ActiveRecord::Base
...
@@ -97,6 +97,20 @@ class Label < ActiveRecord::Base
merge_requests_count
(
user
,
project_id:
project
.
try
(
:id
)
||
project_id
,
state:
'opened'
)
merge_requests_count
(
user
,
project_id:
project
.
try
(
:id
)
||
project_id
,
state:
'opened'
)
end
end
def
prioritize!
(
project
,
value
)
label_priority
=
priorities
.
find_or_initialize_by
(
project_id:
project
.
id
)
label_priority
.
priority
=
value
label_priority
.
save!
end
def
unprioritize!
(
project
)
priorities
.
where
(
project:
project
).
delete_all
end
def
priority
(
project
)
priorities
.
find_by
(
project:
project
).
try
(
:priority
)
end
def
template?
def
template?
template
template
end
end
...
@@ -135,7 +149,7 @@ class Label < ActiveRecord::Base
...
@@ -135,7 +149,7 @@ class Label < ActiveRecord::Base
def
as_json
(
options
=
{})
def
as_json
(
options
=
{})
super
(
options
).
tap
do
|
json
|
super
(
options
).
tap
do
|
json
|
json
[
:priority
]
=
priorit
ies
.
find_by
(
project:
options
[
:project
]).
try
(
:priority
)
if
options
.
has_key?
(
:project
)
json
[
:priority
]
=
priorit
y
(
options
[
:project
]
)
if
options
.
has_key?
(
:project
)
end
end
end
end
...
...
spec/models/label_spec.rb
View file @
530aae90
...
@@ -46,4 +46,62 @@ describe Label, models: true do
...
@@ -46,4 +46,62 @@ describe Label, models: true do
expect
(
label
.
title
).
to
eq
(
'foo & bar?'
)
expect
(
label
.
title
).
to
eq
(
'foo & bar?'
)
end
end
end
end
describe
'priorization'
do
subject
(
:label
)
{
create
(
:label
)
}
let
(
:project
)
{
label
.
project
}
describe
'#prioritize!'
do
context
'when label is not prioritized'
do
it
'creates a label priority'
do
expect
{
label
.
prioritize!
(
project
,
1
)
}.
to
change
(
label
.
priorities
,
:count
).
by
(
1
)
end
it
'sets label priority'
do
label
.
prioritize!
(
project
,
1
)
expect
(
label
.
priorities
.
first
.
priority
).
to
eq
1
end
end
context
'when label is prioritized'
do
let!
(
:priority
)
{
create
(
:label_priority
,
project:
project
,
label:
label
,
priority:
0
)
}
it
'does not create a label priority'
do
expect
{
label
.
prioritize!
(
project
,
1
)
}.
not_to
change
(
label
.
priorities
,
:count
)
end
it
'updates label priority'
do
label
.
prioritize!
(
project
,
1
)
expect
(
priority
.
reload
.
priority
).
to
eq
1
end
end
end
describe
'#unprioritize!'
do
it
'removes label priority'
do
create
(
:label_priority
,
project:
project
,
label:
label
,
priority:
0
)
expect
{
label
.
unprioritize!
(
project
)
}.
to
change
(
label
.
priorities
,
:count
).
by
(
-
1
)
end
end
describe
'#priority'
do
context
'when label is not prioritized'
do
it
'returns nil'
do
expect
(
label
.
priority
(
project
)).
to
be_nil
end
end
context
'when label is prioritized'
do
it
'returns label priority'
do
create
(
:label_priority
,
project:
project
,
label:
label
,
priority:
1
)
expect
(
label
.
priority
(
project
)).
to
eq
1
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