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
52e0c3b5
Commit
52e0c3b5
authored
Sep 19, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add CRUD for Group Labels
parent
d820c090
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
238 additions
and
5 deletions
+238
-5
app/assets/javascripts/dispatcher.js.es6
app/assets/javascripts/dispatcher.js.es6
+2
-0
app/controllers/groups/labels_controller.rb
app/controllers/groups/labels_controller.rb
+67
-0
app/helpers/labels_helper.rb
app/helpers/labels_helper.rb
+23
-5
app/policies/group_policy.rb
app/policies/group_policy.rb
+1
-0
app/views/groups/labels/_form.html.haml
app/views/groups/labels/_form.html.haml
+33
-0
app/views/groups/labels/_label.html.haml
app/views/groups/labels/_label.html.haml
+53
-0
app/views/groups/labels/_label_row.html.haml
app/views/groups/labels/_label_row.html.haml
+6
-0
app/views/groups/labels/destroy.js.haml
app/views/groups/labels/destroy.js.haml
+2
-0
app/views/groups/labels/edit.html.haml
app/views/groups/labels/edit.html.haml
+8
-0
app/views/groups/labels/index.html.haml
app/views/groups/labels/index.html.haml
+24
-0
app/views/groups/labels/new.html.haml
app/views/groups/labels/new.html.haml
+9
-0
app/views/layouts/nav/_group.html.haml
app/views/layouts/nav/_group.html.haml
+4
-0
config/routes/group.rb
config/routes/group.rb
+6
-0
No files found.
app/assets/javascripts/dispatcher.js.es6
View file @
52e0c3b5
...
...
@@ -168,6 +168,8 @@
shortcut_handler = new ShortcutsNavigation();
new ShortcutsBlob(true);
break;
case 'groups:labels:new':
case 'groups:labels:edit':
case 'projects:labels:new':
case 'projects:labels:edit':
new Labels();
...
...
app/controllers/groups/labels_controller.rb
0 → 100644
View file @
52e0c3b5
class
Groups::LabelsController
<
Groups
::
ApplicationController
include
ToggleSubscriptionAction
before_action
:label
,
only:
[
:edit
,
:update
,
:destroy
,
:toggle_subscription
]
before_action
:authorize_admin_labels!
,
only:
[
:new
,
:create
,
:edit
,
:update
,
:destroy
]
respond_to
:html
def
index
@labels
=
@group
.
labels
.
page
(
params
[
:page
])
end
def
new
@label
=
@group
.
labels
.
new
end
def
create
@label
=
@group
.
labels
.
create
(
label_params
)
if
@label
.
valid?
redirect_to
group_labels_path
(
@group
)
else
render
:new
end
end
def
edit
end
def
update
if
@label
.
update_attributes
(
label_params
)
redirect_to
group_labels_path
(
@group
)
else
render
:edit
end
end
def
destroy
@label
.
destroy
respond_to
do
|
format
|
format
.
html
do
redirect_to
group_labels_path
(
@group
),
notice:
'Label was removed'
end
format
.
js
end
end
protected
def
authorize_admin_labels!
return
render_404
unless
can?
(
current_user
,
:admin_label
,
@group
)
end
def
authorize_read_labels!
return
render_404
unless
can?
(
current_user
,
:read_label
,
@group
)
end
def
label
@label
||=
@group
.
labels
.
find
(
params
[
:id
])
end
alias_method
:subscribable_resource
,
:label
def
label_params
params
.
require
(
:label
).
permit
(
:title
,
:description
,
:color
)
end
end
app/helpers/labels_helper.rb
View file @
52e0c3b5
...
...
@@ -43,11 +43,29 @@ module LabelsHelper
end
end
def
label_filter_path
(
project
,
label
,
type:
issue
)
send
(
"namespace_project_
#{
type
.
to_s
.
pluralize
}
_path"
,
project
.
namespace
,
project
,
label_name:
[
label
.
name
])
def
link_to_group_label
(
label
,
group:
nil
,
type: :issue
,
tooltip:
true
,
css_class:
nil
,
&
block
)
group
||=
@group
||
label
.
group
link
=
label_filter_path
(
group
,
label
,
type:
type
)
if
block_given?
link_to
link
,
class:
css_class
,
&
block
else
link_to
render_colored_label
(
label
,
tooltip:
tooltip
),
link
,
class:
css_class
end
end
def
label_filter_path
(
subject
,
label
,
type:
issue
)
case
subject
when
Project
send
(
"namespace_project_
#{
type
.
to_s
.
pluralize
}
_path"
,
subject
.
namespace
,
subject
,
label_name:
[
label
.
name
])
when
Group
send
(
"
#{
type
.
to_s
.
pluralize
}
_group_path"
,
subject
,
label_name:
[
label
.
name
])
end
end
def
project_label_names
...
...
app/policies/group_policy.rb
View file @
52e0c3b5
...
...
@@ -19,6 +19,7 @@ class GroupPolicy < BasePolicy
if
master
can!
:create_projects
can!
:admin_milestones
can!
:admin_label
end
# Only group owner and administrators can admin group
...
...
app/views/groups/labels/_form.html.haml
0 → 100644
View file @
52e0c3b5
=
form_for
@label
,
as: :label
,
url:
url
,
html:
{
class:
'form-horizontal label-form js-quick-submit js-requires-input'
}
do
|
f
|
=
form_errors
(
@label
)
.form-group
=
f
.
label
:title
,
class:
'control-label'
.col-sm-10
=
f
.
text_field
:title
,
class:
"form-control"
,
required:
true
,
autofocus:
true
.form-group
=
f
.
label
:description
,
class:
'control-label'
.col-sm-10
=
f
.
text_field
:description
,
class:
"form-control js-quick-submit"
.form-group
=
f
.
label
:color
,
"Background color"
,
class:
'control-label'
.col-sm-10
.input-group
.input-group-addon.label-color-preview
=
f
.
color_field
:color
,
class:
"form-control"
.help-block
Choose any color.
%br
Or you can choose one of suggested colors below
.suggest-colors
-
suggested_colors
.
each
do
|
color
|
=
link_to
'#'
,
style:
"background-color:
#{
color
}
"
,
data:
{
color:
color
}
do
.form-actions
-
if
@label
.
persisted?
=
f
.
submit
'Save changes'
,
class:
'btn btn-save js-save-button'
-
else
=
f
.
submit
'Create Label'
,
class:
'btn btn-create js-save-button'
=
link_to
"Cancel"
,
group_labels_path
(
@group
),
class:
'btn btn-cancel'
app/views/groups/labels/_label.html.haml
0 → 100644
View file @
52e0c3b5
-
label_css_id
=
dom_id
(
label
)
-
open_issues_count
=
label
.
open_issues_count
(
current_user
)
-
open_merge_requests_count
=
label
.
open_merge_requests_count
%li
{
id:
label_css_id
,
data:
{
id:
label
.
id
}
}
=
render
'label_row'
,
label:
label
.visible-xs.visible-sm-inline-block.visible-md-inline-block.dropdown
%button
.btn.btn-default.label-options-toggle
{
data:
{
toggle:
'dropdown'
}
}
Options
%span
.caret
.dropdown-menu.dropdown-menu-align-right
%ul
%li
=
link_to_group_label
(
label
,
type: :merge_request
)
do
=
pluralize
open_merge_requests_count
,
'merge request'
%li
=
link_to_group_label
(
label
)
do
=
pluralize
open_issues_count
,
'open issue'
-
if
current_user
%li
.label-subscription
{
data:
{
url:
toggle_subscription_group_label_path
(
@group
,
label
)
}
}
%a
.js-subscribe-button.label-subscribe-button.subscription-status
{
role:
"button"
,
href:
"#"
,
data:
{
toggle:
"tooltip"
,
status:
label_subscription_status
(
label
)
}
}
%span
=
label_subscription_toggle_button_text
(
label
)
-
if
can?
current_user
,
:admin_label
,
@group
%li
=
link_to
'Edit'
,
edit_group_label_path
(
@group
,
label
)
%li
=
link_to
'Delete'
,
group_label_path
(
@group
,
label
),
title:
'Delete'
,
method: :delete
,
remote:
true
,
data:
{
confirm:
"Remove this label? Are you sure?"
}
.pull-right.hidden-xs.hidden-sm.hidden-md
=
link_to_group_label
(
label
,
type: :merge_request
,
css_class:
'btn btn-transparent btn-action'
)
do
=
pluralize
open_merge_requests_count
,
'merge request'
=
link_to_group_label
(
label
,
css_class:
'btn btn-transparent btn-action'
)
do
=
pluralize
open_issues_count
,
'open issue'
-
if
current_user
.label-subscription.inline
{
data:
{
url:
toggle_subscription_group_label_path
(
@group
,
label
)
}
}
%button
.js-subscribe-button.label-subscribe-button.btn.btn-transparent.btn-action.subscription-status
{
type:
"button"
,
title:
label_subscription_toggle_button_text
(
label
),
data:
{
toggle:
"tooltip"
,
status:
label_subscription_status
(
label
)
}
}
%span
.sr-only
=
label_subscription_toggle_button_text
(
label
)
=
icon
(
'eye'
,
class:
'label-subscribe-button-icon'
)
=
icon
(
'spinner spin'
,
class:
'label-subscribe-button-loading'
)
-
if
can?
current_user
,
:admin_label
,
@group
=
link_to
edit_group_label_path
(
@group
,
label
),
title:
'Edit'
,
class:
'btn btn-transparent btn-action'
,
data:
{
toggle:
'tooltip'
}
do
%span
.sr-only
Edit
=
icon
(
'pencil-square-o'
)
=
link_to
group_label_path
(
@group
,
label
),
title:
'Delete'
,
class:
'btn btn-transparent btn-action remove-row'
,
method: :delete
,
remote:
true
,
data:
{
confirm:
'Remove this label? Are you sure?'
,
toggle:
'tooltip'
}
do
%span
.sr-only
Delete
=
icon
(
'trash-o'
)
-
if
current_user
:javascript
new
Subscription
(
'
##{dom_id(label)} .label-subscription
'
);
app/views/groups/labels/_label_row.html.haml
0 → 100644
View file @
52e0c3b5
%span
.label-row
%span
.label-name
=
link_to_group_label
(
label
,
tooltip:
false
)
-
if
label
.
description
%span
.label-description
=
markdown
(
label
.
description
,
pipeline: :single_line
)
app/views/groups/labels/destroy.js.haml
0 → 100644
View file @
52e0c3b5
-
if
@group
.
labels
.
empty?
$('.labels').load(document.URL + ' .nothing-here-block').hide().fadeIn(1000)
app/views/groups/labels/edit.html.haml
0 → 100644
View file @
52e0c3b5
-
page_title
'Edit'
,
@label
.
name
,
'Labels'
%h3
.page-title
=
icon
(
'folder-open'
)
Edit Group Label
%hr
=
render
'form'
,
url:
group_label_path
(
@group
,
@label
)
app/views/groups/labels/index.html.haml
0 → 100644
View file @
52e0c3b5
-
page_title
'Labels'
.top-area.adjust
.nav-text
Labels can be applied to issues and merge requests.
.nav-controls
-
if
can?
(
current_user
,
:admin_label
,
@group
)
=
link_to
new_group_label_path
(
@group
),
class:
"btn btn-new"
do
New label
.labels
-
hide
=
@group
.
labels
.
empty?
||
(
params
[
:page
].
present?
&&
params
[
:page
]
!=
'1'
)
.group-labels
%h5
{
class:
(
'hide'
if
hide
)
}
=
icon
(
'folder-open'
)
Group Labels
-
if
@labels
.
present?
%ul
.content-list.manage-labels-list.js-group-labels
=
render
partial:
'label'
,
collection:
@labels
,
as: :label
=
paginate
@labels
,
theme:
'gitlab'
-
else
.nothing-here-block
No labels created yet.
app/views/groups/labels/new.html.haml
0 → 100644
View file @
52e0c3b5
-
page_title
'New Group Label'
-
header_title
group_title
(
@group
,
'Labels'
,
group_labels_path
(
@group
))
%h3
.page-title
=
icon
(
'folder-open'
)
New Group Label
%hr
=
render
'form'
,
url:
group_labels_path
app/views/layouts/nav/_group.html.haml
View file @
52e0c3b5
...
...
@@ -13,6 +13,10 @@
=
link_to
activity_group_path
(
@group
),
title:
'Activity'
do
%span
Activity
=
nav_link
(
controller:
[
:group
,
:labels
])
do
=
link_to
group_labels_path
(
@group
),
title:
'Labels'
do
%span
Labels
=
nav_link
(
controller:
[
:group
,
:milestones
])
do
=
link_to
group_milestones_path
(
@group
),
title:
'Milestones'
do
%span
...
...
config/routes/group.rb
View file @
52e0c3b5
...
...
@@ -28,5 +28,11 @@ resources :groups, constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ } do
resource
:avatar
,
only:
[
:destroy
]
resources
:milestones
,
constraints:
{
id:
/[^\/]+/
},
only:
[
:index
,
:show
,
:update
,
:new
,
:create
]
resources
:labels
,
except:
[
:show
],
constraints:
{
id:
/\d+/
}
do
member
do
post
:toggle_subscription
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