Fix fork button being disabled for users who can fork to group
Previously the fork button was disabled for all users if they have exceeded their project limit. This fixes that by changing the check to see if the user can fork to a group instead of their own namespace. This behaviour is already possible by visiting the new fork page directly, so this just fixes the button being disabled. Closes #38462
This commit is contained in:
parent
ccfe686007
commit
8585ae61e7
|
@ -14,7 +14,6 @@
|
|||
/* global NotificationsDropdown */
|
||||
/* global GroupAvatar */
|
||||
/* global LineHighlighter */
|
||||
/* global ProjectFork */
|
||||
/* global BuildArtifacts */
|
||||
/* global GroupsSelect */
|
||||
/* global Search */
|
||||
|
@ -476,7 +475,9 @@ import { ajaxGet, convertPermissionToBoolean } from './lib/utils/common_utils';
|
|||
shortcut_handler = true;
|
||||
break;
|
||||
case 'projects:forks:new':
|
||||
new ProjectFork();
|
||||
import(/* webpackChunkName: 'project_fork' */ './project_fork')
|
||||
.then(fork => fork.default())
|
||||
.catch(() => {});
|
||||
break;
|
||||
case 'projects:artifacts:browse':
|
||||
new ShortcutsNavigation();
|
||||
|
|
|
@ -124,7 +124,6 @@ import './preview_markdown';
|
|||
import './project';
|
||||
import './project_avatar';
|
||||
import './project_find_file';
|
||||
import './project_fork';
|
||||
import './project_import';
|
||||
import './project_label_subscription';
|
||||
import './project_new';
|
||||
|
|
|
@ -1,13 +1,8 @@
|
|||
/* eslint-disable func-names, space-before-function-paren, wrap-iife, prefer-arrow-callback, max-len */
|
||||
(function() {
|
||||
this.ProjectFork = (function() {
|
||||
function ProjectFork() {
|
||||
$('.fork-thumbnail a').on('click', function() {
|
||||
$('.fork-namespaces').hide();
|
||||
return $('.save-project-loader').show();
|
||||
});
|
||||
}
|
||||
export default () => {
|
||||
$('.fork-thumbnail a').on('click', function forkThumbnailClicked() {
|
||||
if ($(this).hasClass('disabled')) return false;
|
||||
|
||||
return ProjectFork;
|
||||
})();
|
||||
}).call(window);
|
||||
$('.fork-namespaces').hide();
|
||||
return $('.save-project-loader').show();
|
||||
});
|
||||
};
|
||||
|
|
|
@ -516,7 +516,7 @@ a.deploy-project-label {
|
|||
text-align: center;
|
||||
width: 169px;
|
||||
|
||||
&:hover,
|
||||
&:hover:not(.disabled),
|
||||
&.forked {
|
||||
background-color: $row-hover;
|
||||
border-color: $row-hover-border;
|
||||
|
@ -543,6 +543,15 @@ a.deploy-project-label {
|
|||
padding-top: $gl-padding;
|
||||
color: $gl-text-color;
|
||||
|
||||
&.disabled {
|
||||
opacity: .3;
|
||||
cursor: not-allowed;
|
||||
|
||||
&:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
|
||||
.caption {
|
||||
min-height: 30px;
|
||||
padding: $gl-padding 0;
|
||||
|
|
|
@ -4,12 +4,11 @@
|
|||
= link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: _('Go to your fork'), class: 'btn has-tooltip' do
|
||||
= custom_icon('icon_fork')
|
||||
%span= s_('GoToYourFork|Fork')
|
||||
- elsif !current_user.can_create_project?
|
||||
= link_to new_project_fork_path(@project), title: _('You have reached your project limit'), class: 'btn has-tooltip disabled' do
|
||||
= custom_icon('icon_fork')
|
||||
%span= s_('CreateNewFork|Fork')
|
||||
- else
|
||||
= link_to new_project_fork_path(@project), class: 'btn' do
|
||||
- can_fork = current_user.can_create_project? || current_user.manageable_namespaces.count > 1
|
||||
= link_to new_project_fork_path(@project),
|
||||
class: "btn btn-default #{'has-tooltip disabled' unless can_fork}",
|
||||
title: (_('You have reached your project limit') unless can_fork) do
|
||||
= custom_icon('icon_fork')
|
||||
%span= s_('CreateNewFork|Fork')
|
||||
.count-with-arrow
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
- page_title "Fork project"
|
||||
- can_create_project = current_user.can_create_project?
|
||||
|
||||
.row.prepend-top-default
|
||||
.col-lg-3
|
||||
|
@ -13,7 +14,7 @@
|
|||
- if @namespaces.present?
|
||||
%label.label-light
|
||||
%span
|
||||
Click to fork the project to a user or group
|
||||
#{ "Click to fork the project to a #{'user or' if can_create_project} group" }
|
||||
- @namespaces.in_groups_of(6, false) do |group|
|
||||
.row
|
||||
- group.each do |namespace|
|
||||
|
@ -29,8 +30,12 @@
|
|||
.caption
|
||||
= namespace.human_name
|
||||
- else
|
||||
.fork-thumbnail
|
||||
= link_to project_forks_path(@project, namespace_key: namespace.id), method: "POST" do
|
||||
- is_disabled = namespace.kind === 'user' && !can_create_project
|
||||
.fork-thumbnail{ class: ("disabled" if is_disabled) }
|
||||
= link_to project_forks_path(@project, namespace_key: namespace.id),
|
||||
method: "POST",
|
||||
class: ("disabled has-tooltip" if is_disabled),
|
||||
title: (_('You have reached your project limit') if is_disabled) do
|
||||
- if /no_((\w*)_)*avatar/.match(avatar)
|
||||
.no-avatar
|
||||
= icon 'question'
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fixed fork button being disabled for users who can fork to a group
|
||||
merge_request:
|
||||
author:
|
||||
type: fixed
|
|
@ -0,0 +1,57 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'Project fork' do
|
||||
let(:user) { create(:user) }
|
||||
let(:project) { create(:project, :public, :repository) }
|
||||
|
||||
before do
|
||||
sign_in user
|
||||
end
|
||||
|
||||
it 'allows user to fork project' do
|
||||
visit project_path(project)
|
||||
|
||||
expect(page).not_to have_css('a.disabled', text: 'Fork')
|
||||
end
|
||||
|
||||
it 'disables fork button when user has exceeded project limit' do
|
||||
user.projects_limit = 0
|
||||
user.save!
|
||||
|
||||
visit project_path(project)
|
||||
|
||||
expect(page).to have_css('a.disabled', text: 'Fork')
|
||||
end
|
||||
|
||||
context 'master in group' do
|
||||
before do
|
||||
group = create(:group)
|
||||
group.add_master(user)
|
||||
end
|
||||
|
||||
it 'allows user to fork project to group or to user namespace' do
|
||||
visit project_path(project)
|
||||
|
||||
expect(page).not_to have_css('a.disabled', text: 'Fork')
|
||||
|
||||
click_link 'Fork'
|
||||
|
||||
expect(page).to have_css('.fork-thumbnail', count: 2)
|
||||
expect(page).not_to have_css('.fork-thumbnail.disabled')
|
||||
end
|
||||
|
||||
it 'allows user to fork project to group and not user when exceeded project limit' do
|
||||
user.projects_limit = 0
|
||||
user.save!
|
||||
|
||||
visit project_path(project)
|
||||
|
||||
expect(page).not_to have_css('a.disabled', text: 'Fork')
|
||||
|
||||
click_link 'Fork'
|
||||
|
||||
expect(page).to have_css('.fork-thumbnail', count: 2)
|
||||
expect(page).to have_css('.fork-thumbnail.disabled')
|
||||
end
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue