45001-component-to-show-the-list-of-non-working-days-of-year
bsatarnejad
2 years ago
commit
e9aec723f3
|
After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 96 KiB After Width: | Height: | Size: 152 KiB |
|
Before Width: | Height: | Size: 141 KiB After Width: | Height: | Size: 406 KiB |
|
After Width: | Height: | Size: 152 KiB |
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,44 @@ |
||||
#-- copyright |
||||
# OpenProject is an open source project management software. |
||||
# Copyright (C) 2012-2022 the OpenProject GmbH |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License version 3. |
||||
# |
||||
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: |
||||
# Copyright (C) 2006-2013 Jean-Philippe Lang |
||||
# Copyright (C) 2010-2013 the ChiliProject Team |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License |
||||
# as published by the Free Software Foundation; either version 2 |
||||
# of the License, or (at your option) any later version. |
||||
# |
||||
# This program is distributed in the hope that it will be useful, |
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
# GNU General Public License for more details. |
||||
# |
||||
# You should have received a copy of the GNU General Public License |
||||
# along with this program; if not, write to the Free Software |
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
||||
# |
||||
# See COPYRIGHT and LICENSE files for more details. |
||||
#++ |
||||
|
||||
namespace :migrations do |
||||
desc "Fix the missing notification settings" |
||||
task fix_missing_notification_settings: :environment do |
||||
ActiveRecord::Base.connection.execute <<~SQL.squish |
||||
INSERT INTO |
||||
notification_settings |
||||
(user_id) |
||||
SELECT |
||||
u.id |
||||
FROM |
||||
users u |
||||
WHERE type = 'User' |
||||
AND NOT EXISTS (SELECT * FROM notification_settings ns WHERE ns.user_id = u.id) |
||||
SQL |
||||
end |
||||
end |
||||
@ -1,13 +1,13 @@ |
||||
#English strings go here |
||||
tr: |
||||
permission_view_team_planner: "View team planner" |
||||
permission_manage_team_planner: "Manage team planner" |
||||
project_module_team_planner_view: "Team planner" |
||||
permission_view_team_planner: "Takım planlayıcıyı görüntüle" |
||||
permission_manage_team_planner: "Takım planlayıcıyı yönet" |
||||
project_module_team_planner_view: "Takım planlayıcısı" |
||||
team_planner: |
||||
label_team_planner: "Team planner" |
||||
label_create_new_team_planner: "Create new team planner" |
||||
label_team_planner_plural: "Team planners" |
||||
label_assignees: "Devralanlar" |
||||
label_team_planner: "Takım planlayıcısı" |
||||
label_create_new_team_planner: "Yeni takım planlayıcısı oluştur" |
||||
label_team_planner_plural: "Takım planlayıcıları" |
||||
label_assignees: "Atananlar" |
||||
upsale: |
||||
title: "Team planner" |
||||
description: "Get a complete overview of your team’s planning with Team Planner. Stretch, shorten and drag-and-drop work packages to modify dates, move them or change assignees." |
||||
title: "Takım planlayıcısı" |
||||
description: "Team Planner ile ekibinizin planlamasına ilişkin eksiksiz bir genel bakış elde edin. Tarihleri değiştirmek, taşımak veya atananları değiştirmek için iş paketlerini genişletin, kısaltın ve sürükleyip bırakın." |
||||
|
||||
@ -0,0 +1,142 @@ |
||||
#-- copyright |
||||
# OpenProject is an open source project management software. |
||||
# Copyright (C) 2012-2022 the OpenProject GmbH |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License version 3. |
||||
# |
||||
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: |
||||
# Copyright (C) 2006-2013 Jean-Philippe Lang |
||||
# Copyright (C) 2010-2013 the ChiliProject Team |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License |
||||
# as published by the Free Software Foundation; either version 2 |
||||
# of the License, or (at your option) any later version. |
||||
# |
||||
# This program is distributed in the hope that it will be useful, |
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
# GNU General Public License for more details. |
||||
# |
||||
# You should have received a copy of the GNU General Public License |
||||
# along with this program; if not, write to the Free Software |
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
||||
# |
||||
# See COPYRIGHT and LICENSE files for more details. |
||||
#++ |
||||
|
||||
require 'spec_helper' |
||||
|
||||
describe 'Activity page navigation' do |
||||
include ActiveSupport::Testing::TimeHelpers |
||||
|
||||
shared_let(:project) { create(:project, enabled_module_names: Setting.default_projects_modules + ['activity']) } |
||||
shared_let(:subproject) do |
||||
create(:project, parent: project, enabled_module_names: Setting.default_projects_modules + ['activity']) |
||||
end |
||||
shared_let(:user) do |
||||
create(:user, |
||||
member_in_projects: [project, subproject], |
||||
member_with_permissions: %w[view_work_packages]) |
||||
end |
||||
shared_let(:project_work_package) { create(:work_package, project:, subject: 'Work package for parent project') } |
||||
shared_let(:subproject_work_package) { create(:work_package, project: subproject, subject: 'Work package for subproject') } |
||||
shared_let(:project_older_work_package) do |
||||
travel_to 45.days.ago |
||||
create(:work_package, project:, subject: 'Work package older for parent project') |
||||
ensure |
||||
travel_back |
||||
end |
||||
shared_let(:subproject_older_work_package) do |
||||
travel_to 45.days.ago |
||||
create(:work_package, project: subproject, subject: 'Work package older for subproject') |
||||
ensure |
||||
travel_back |
||||
end |
||||
|
||||
current_user { user } |
||||
|
||||
it 'stays on the same period when changing filters' do |
||||
visit project_activity_index_path(project) |
||||
click_link('Previous') |
||||
|
||||
expect(page) |
||||
.to have_link(text: /#{subproject_older_work_package.subject}/) |
||||
|
||||
uncheck 'Subprojects' |
||||
click_button 'Apply' |
||||
|
||||
# Still on the same page. Filters applied. subproject work package created |
||||
# 45 days ago should not be visible anymore |
||||
expect(page) |
||||
.not_to have_link(text: /#{subproject_older_work_package.subject}/) |
||||
end |
||||
|
||||
shared_examples 'subprojects checkbox state is preserved' do |
||||
it 'keeps Subprojects checked/unchecked when navigating between pages' do |
||||
visit project_activity_index_path(project) |
||||
|
||||
aggregate_failures do |
||||
# Subprojects is initially checked or not depending on a setting |
||||
if Setting.display_subprojects_work_packages? |
||||
expect(page).to have_checked_field('Subprojects') |
||||
else |
||||
expect(page).to have_unchecked_field('Subprojects') |
||||
end |
||||
|
||||
# work packages for both projects are visible |
||||
expect(page) |
||||
.to have_link(text: /#{project_work_package.subject}/) |
||||
expect(page) |
||||
.to have_link(text: /#{subproject_work_package.subject}/) |
||||
end |
||||
|
||||
uncheck 'Subprojects' |
||||
click_button 'Apply' |
||||
|
||||
aggregate_failures do |
||||
expect(page).to have_unchecked_field('Subprojects') |
||||
expect(page) |
||||
.to have_link(text: /#{project_work_package.subject}/) |
||||
# work packages for subproject is not visible anymore |
||||
expect(page) |
||||
.not_to have_link(text: /#{subproject_work_package.subject}/) |
||||
end |
||||
|
||||
click_link('Previous') |
||||
|
||||
aggregate_failures do |
||||
# Subprojects should still be unchecked, bug #45348 |
||||
expect(page).to have_unchecked_field('Subprojects') |
||||
expect(page) |
||||
.to have_link(text: /#{project_older_work_package.subject}/) |
||||
|
||||
# work packages for subproject still not visible |
||||
expect(page) |
||||
.not_to have_link(text: /#{subproject_older_work_package.subject}/) |
||||
end |
||||
|
||||
click_link('Next') |
||||
|
||||
aggregate_failures do |
||||
# Subprojects should still be unchecked, bug #45348 |
||||
expect(page).to have_unchecked_field('Subprojects') |
||||
expect(page) |
||||
.to have_link(text: /#{project_work_package.subject}/) |
||||
|
||||
# work packages for subproject still not visible |
||||
expect(page) |
||||
.not_to have_link(text: /#{subproject_work_package.subject}/) |
||||
end |
||||
end |
||||
end |
||||
|
||||
context 'with subprojects included by default', with_setting: { display_subprojects_work_packages: true } do |
||||
include_examples 'subprojects checkbox state is preserved' |
||||
end |
||||
|
||||
context 'with subprojects NOT included by default', with_setting: { display_subprojects_work_packages: false } do |
||||
include_examples 'subprojects checkbox state is preserved' |
||||
end |
||||
end |
||||
@ -0,0 +1,53 @@ |
||||
#-- copyright |
||||
# OpenProject is an open source project management software. |
||||
# Copyright (C) 2012-2022 the OpenProject GmbH |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License version 3. |
||||
# |
||||
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: |
||||
# Copyright (C) 2006-2013 Jean-Philippe Lang |
||||
# Copyright (C) 2010-2013 the ChiliProject Team |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License |
||||
# as published by the Free Software Foundation; either version 2 |
||||
# of the License, or (at your option) any later version. |
||||
# |
||||
# This program is distributed in the hope that it will be useful, |
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
# GNU General Public License for more details. |
||||
# |
||||
# You should have received a copy of the GNU General Public License |
||||
# along with this program; if not, write to the Free Software |
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
||||
# |
||||
# See COPYRIGHT and LICENSE files for more details. |
||||
#++ |
||||
|
||||
require 'spec_helper' |
||||
|
||||
describe Queries::Members::MemberQuery, 'Integration' do |
||||
let(:instance) { described_class.new } |
||||
|
||||
current_user { user } |
||||
|
||||
subject { instance.results } |
||||
|
||||
context 'with two groups in a project' do |
||||
let(:project) { create(:project) } |
||||
let(:user) { create(:user) } |
||||
let(:role) { create(:role, permissions: %i[view_members manage_members]) } |
||||
let!(:group1) { create(:group, name: 'A', member_in_project: project, member_through_role: role, members: [user]) } |
||||
let!(:group2) { create(:group, name: 'B', member_in_project: project, member_through_role: role, members: [user]) } |
||||
|
||||
it 'only returns one user when filtering for one group (Regression #45331)' do |
||||
instance.where 'project_id', '=', [project.id.to_s] |
||||
instance.where 'group', '=', [group1.id.to_s] |
||||
|
||||
expect(subject.count).to eq 1 |
||||
expect(subject.first.user_id).to eq user.id |
||||
end |
||||
end |
||||
end |
||||
Loading…
Reference in new issue