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
Léo-Paul Géneau
gitlab-ce
Commits
1af4d29b
Commit
1af4d29b
authored
Nov 15, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow users to subscribe to a group label at group or project level
parent
733fbebe
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
122 additions
and
11 deletions
+122
-11
app/assets/javascripts/group_label_subscription.js.es6
app/assets/javascripts/group_label_subscription.js.es6
+48
-0
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+9
-1
app/helpers/labels_helper.rb
app/helpers/labels_helper.rb
+14
-0
app/models/concerns/subscribable.rb
app/models/concerns/subscribable.rb
+23
-4
app/views/shared/_label.html.haml
app/views/shared/_label.html.haml
+28
-6
No files found.
app/assets/javascripts/group_label_subscription.js.es6
0 → 100644
View file @
1af4d29b
/* eslint-disable */
(function(global) {
class GroupLabelSubscription {
constructor(container) {
const $container = $(container);
this.$dropdown = $container.find('.dropdown');
this.$unsubscribeBtn = $container.find('.js-unsubscribe-button');
$container.on('click', '.js-subscribe-button', this.subscribe.bind(this));
$container.on('click', '.js-unsubscribe-button', this.unsubscribe.bind(this));
}
unsubscribe(event) {
event.preventDefault();
const url = this.$unsubscribeBtn.attr('data-url');
$.ajax({
type: 'POST',
url: url
}).done(() => {
this.$dropdown.toggleClass('hidden');
this.$unsubscribeBtn.toggleClass('hidden');
this.$unsubscribeBtn.removeAttr('data-url');
});
}
subscribe(event) {
event.preventDefault();
const $btn = $(event.currentTarget);
const url = $btn.attr('data-url');
this.$unsubscribeBtn.attr('data-url', url);
$.ajax({
type: 'POST',
url: url
}).done(() => {
this.$dropdown.toggleClass('hidden');
this.$unsubscribeBtn.toggleClass('hidden');
});
}
}
global.GroupLabelSubscription = GroupLabelSubscription;
})(window.gl || (window.gl = {}));
app/assets/stylesheets/pages/labels.scss
View file @
1af4d29b
...
@@ -90,7 +90,7 @@
...
@@ -90,7 +90,7 @@
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
display
:
inline-block
;
display
:
inline-block
;
width
:
3
5
%
;
width
:
3
0
%
;
margin-left
:
10px
;
margin-left
:
10px
;
margin-bottom
:
0
;
margin-bottom
:
0
;
vertical-align
:
middle
;
vertical-align
:
middle
;
...
@@ -222,6 +222,14 @@
...
@@ -222,6 +222,14 @@
width
:
100%
;
width
:
100%
;
}
}
.label-subscription
{
vertical-align
:
middle
;
.dropdown-group-label
a
{
cursor
:
pointer
;
}
}
.label-subscribe-button
{
.label-subscribe-button
{
.label-subscribe-button-icon
{
.label-subscribe-button-icon
{
&
[
disabled
]
{
&
[
disabled
]
{
...
...
app/helpers/labels_helper.rb
View file @
1af4d29b
...
@@ -140,6 +140,20 @@ module LabelsHelper
...
@@ -140,6 +140,20 @@ module LabelsHelper
end
end
end
end
def
group_label_subscription_status
(
label
,
project
)
return
'project-level'
if
label
.
subscribed?
(
current_user
,
project
)
return
'group-level'
if
label
.
subscribed?
(
current_user
)
'unsubscribed'
end
def
group_label_unsubscribe_path
(
label
,
project
)
case
group_label_subscription_status
(
label
,
project
)
when
'project-level'
then
toggle_subscription_namespace_project_label_path
(
@project
.
namespace
,
@project
,
label
)
when
'group-level'
then
toggle_subscription_group_label_path
(
label
.
group
,
label
)
end
end
def
label_subscription_status
(
label
,
project
)
def
label_subscription_status
(
label
,
project
)
label
.
subscribed?
(
current_user
,
project
)
?
'subscribed'
:
'unsubscribed'
label
.
subscribed?
(
current_user
,
project
)
?
'subscribed'
:
'unsubscribed'
end
end
...
...
app/models/concerns/subscribable.rb
View file @
1af4d29b
...
@@ -33,22 +33,41 @@ module Subscribable
...
@@ -33,22 +33,41 @@ module Subscribable
end
end
def
toggle_subscription
(
user
,
project
=
nil
)
def
toggle_subscription
(
user
,
project
=
nil
)
unsubscribe_from_other_levels
(
user
,
project
)
find_or_initialize_subscription
(
user
,
project
).
find_or_initialize_subscription
(
user
,
project
).
update
(
subscribed:
!
subscribed?
(
user
,
project
))
update
(
subscribed:
!
subscribed?
(
user
,
project
))
end
end
def
subscribe
(
user
,
project
=
nil
)
def
subscribe
(
user
,
project
=
nil
)
find_or_initialize_subscription
(
user
,
project
).
unsubscribe_from_other_levels
(
user
,
project
)
update
(
subscribed:
true
)
find_or_initialize_subscription
(
user
,
project
)
.
update
(
subscribed:
true
)
end
end
def
unsubscribe
(
user
,
project
=
nil
)
def
unsubscribe
(
user
,
project
=
nil
)
find_or_initialize_subscription
(
user
,
project
).
unsubscribe_from_other_levels
(
user
,
project
)
update
(
subscribed:
false
)
find_or_initialize_subscription
(
user
,
project
)
.
update
(
subscribed:
false
)
end
end
private
private
def
unsubscribe_from_other_levels
(
user
,
project
)
other_subscriptions
=
subscriptions
.
where
(
user:
user
)
other_subscriptions
=
if
project
.
blank?
other_subscriptions
.
where
.
not
(
project:
nil
)
else
other_subscriptions
.
where
(
project:
nil
)
end
other_subscriptions
.
update_all
(
subscribed:
false
)
end
def
find_or_initialize_subscription
(
user
,
project
)
def
find_or_initialize_subscription
(
user
,
project
)
subscriptions
.
subscriptions
.
find_or_initialize_by
(
user_id:
user
.
id
,
project_id:
project
.
try
(
:id
))
find_or_initialize_by
(
user_id:
user
.
id
,
project_id:
project
.
try
(
:id
))
...
...
app/views/shared/_label.html.haml
View file @
1af4d29b
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
=
pluralize
open_issues_count
,
'open issue'
=
pluralize
open_issues_count
,
'open issue'
-
if
current_user
&&
defined?
(
@project
)
-
if
current_user
&&
defined?
(
@project
)
%li
.label-subscription
%li
.label-subscription
%a
.js-subscribe-button.label-subscribe-button
.subscription-status
{
role:
"button"
,
href:
"#"
,
data:
{
toggle:
"tooltip"
,
status:
label_subscription_status
(
label
,
@project
),
url:
toggle_subscription_namespace_project_label_path
(
@project
.
namespace
,
@project
,
label
)
}
}
%a
.js-subscribe-button.label-subscribe-button
{
role:
'button'
,
href:
'#'
,
data:
{
toggle:
'tooltip'
,
status:
label_subscription_status
(
label
,
@project
),
url:
toggle_subscription_namespace_project_label_path
(
@project
.
namespace
,
@project
,
label
)
}
}
%span
=
label_subscription_toggle_button_text
(
label
,
@project
)
%span
=
label_subscription_toggle_button_text
(
label
,
@project
)
-
if
can?
(
current_user
,
:admin_label
,
label
)
-
if
can?
(
current_user
,
:admin_label
,
label
)
%li
%li
...
@@ -36,9 +36,27 @@
...
@@ -36,9 +36,27 @@
-
if
current_user
&&
defined?
(
@project
)
-
if
current_user
&&
defined?
(
@project
)
.label-subscription.inline
.label-subscription.inline
%button
.js-subscribe-button.label-subscribe-button.btn.btn-default.btn-action.subscription-status
{
type:
"button"
,
title:
label_subscription_toggle_button_text
(
label
,
@project
),
data:
{
toggle:
"tooltip"
,
status:
label_subscription_status
(
label
,
@project
),
url:
toggle_subscription_namespace_project_label_path
(
@project
.
namespace
,
@project
,
label
)
}
}
-
if
label
.
is_a?
(
ProjectLabel
)
%span
=
label_subscription_toggle_button_text
(
label
,
@project
)
%button
.js-subscribe-button.label-subscribe-button.btn.btn-default.btn-action
{
type:
'button'
,
title:
label_subscription_toggle_button_text
(
label
,
@project
),
data:
{
toggle:
'tooltip'
,
status:
label_subscription_status
(
label
,
@project
),
url:
toggle_subscription_namespace_project_label_path
(
@project
.
namespace
,
@project
,
label
)
}
}
=
icon
(
'spinner spin'
,
class:
'label-subscribe-button-loading'
)
%span
=
label_subscription_toggle_button_text
(
label
,
@project
)
=
icon
(
'spinner spin'
,
class:
'label-subscribe-button-loading'
)
-
else
-
status
=
group_label_subscription_status
(
label
,
@project
).
inquiry
%button
.js-unsubscribe-button.label-subscribe-button.btn.btn-default.btn-action
{
type:
'button'
,
class:
(
'hidden'
if
status
.
unsubscribed?
),
title:
'Unsubscribe'
,
data:
{
toggle:
'tooltip'
,
url:
group_label_unsubscribe_path
(
label
,
@project
)
}
}
%span
Unsubscribe
=
icon
(
'spinner spin'
,
class:
'label-subscribe-button-loading'
)
.dropdown.dropdown-group-label
{
class:
(
'hidden'
unless
status
.
unsubscribed?
)
}
%button
.dropdown-menu-toggle
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%span
Subscribe
=
icon
(
'chevron-down'
)
%ul
.dropdown-menu
%li
%a
.js-subscribe-button
{
data:
{
url:
toggle_subscription_namespace_project_label_path
(
@project
.
namespace
,
@project
,
label
)
}
}
Project level
%a
.js-subscribe-button
{
data:
{
url:
toggle_subscription_group_label_path
(
label
.
group
,
label
)
}
}
Group level
-
if
can?
(
current_user
,
:admin_label
,
label
)
-
if
can?
(
current_user
,
:admin_label
,
label
)
=
link_to
edit_label_path
(
label
),
title:
"Edit"
,
class:
'btn btn-transparent btn-action'
,
data:
{
toggle:
"tooltip"
}
do
=
link_to
edit_label_path
(
label
),
title:
"Edit"
,
class:
'btn btn-transparent btn-action'
,
data:
{
toggle:
"tooltip"
}
do
...
@@ -49,5 +67,9 @@
...
@@ -49,5 +67,9 @@
=
icon
(
'trash-o'
)
=
icon
(
'trash-o'
)
-
if
current_user
&&
defined?
(
@project
)
-
if
current_user
&&
defined?
(
@project
)
:javascript
-
if
label
.
is_a?
(
ProjectLabel
)
new
gl
.
LabelSubscription
(
'
##{dom_id(label)} .label-subscription
'
);
:javascript
new
gl
.
LabelSubscription
(
'
##{dom_id(label)} .label-subscription
'
);
-
else
:javascript
new
gl
.
GroupLabelSubscription
(
'
##{dom_id(label)} .label-subscription
'
);
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