From c0b615a0c28c2cabbbc5e62f74bf6a86c56d081e Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 20 Jun 2022 09:25:29 +0200 Subject: [PATCH 1/2] delete views along with their queries --- app/workers/principals/delete_job.rb | 2 +- spec/features/users/delete_spec.rb | 2 +- spec/workers/principals/delete_job_integration_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/workers/principals/delete_job.rb b/app/workers/principals/delete_job.rb index d5e54cefa5..87608d8618 100644 --- a/app/workers/principals/delete_job.rb +++ b/app/workers/principals/delete_job.rb @@ -61,7 +61,7 @@ class Principals::DeleteJob < ApplicationJob end def delete_private_queries(principal) - ::Query.where(user_id: principal.id, public: false).delete_all + ::Query.where(user_id: principal.id, public: false).destroy_all CostQuery.where(user_id: principal.id, is_public: false).delete_all end diff --git a/spec/features/users/delete_spec.rb b/spec/features/users/delete_spec.rb index 3ac5e385fd..89fc6c3169 100644 --- a/spec/features/users/delete_spec.rb +++ b/spec/features/users/delete_spec.rb @@ -91,7 +91,7 @@ describe 'user deletion: ', type: :feature, js: true do password_confirmation: user_password) end - it 'can delete other users if the setting permitts it', selenium: true do + it 'can delete other users if the setting permits it', selenium: true do Setting.users_deletable_by_admins = 1 visit edit_user_path(user) diff --git a/spec/workers/principals/delete_job_integration_spec.rb b/spec/workers/principals/delete_job_integration_spec.rb index bde8b259f1..44fabb0145 100644 --- a/spec/workers/principals/delete_job_integration_spec.rb +++ b/spec/workers/principals/delete_job_integration_spec.rb @@ -209,7 +209,7 @@ describe Principals::DeleteJob, type: :model do shared_examples_for 'private query handling' do let!(:query) do - create(:private_query, user: principal) + create(:private_query, user: principal, views: [create(:view_work_packages_table)]) end before do From 24f2115463036f65e6a98836142911a37b172002 Mon Sep 17 00:00:00 2001 From: OpenProject Actions CI Date: Tue, 21 Jun 2022 03:36:20 +0000 Subject: [PATCH 2/2] update locales from crowdin [ci skip] --- modules/backlogs/config/locales/crowdin/ar.yml | 2 +- modules/costs/config/locales/crowdin/ar.yml | 4 ++-- .../overviews/config/locales/crowdin/ar.yml | 2 +- .../team_planner/config/locales/crowdin/ar.yml | 18 +++++++++--------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/backlogs/config/locales/crowdin/ar.yml b/modules/backlogs/config/locales/crowdin/ar.yml index c90589f022..f0582d420b 100644 --- a/modules/backlogs/config/locales/crowdin/ar.yml +++ b/modules/backlogs/config/locales/crowdin/ar.yml @@ -137,7 +137,7 @@ ar: label_wiki: "Wiki" permission_view_master_backlog: "عرض العمل الرئيسي المتراكم غير المنجز" permission_view_taskboards: "شاهد لوحات المهمات" - permission_select_done_statuses: "Select done statuses" + permission_select_done_statuses: "حدد حالات الاتمام" permission_update_sprints: "قم بتحديث السباقات" points_accepted: "النقاط التي تم قبولها" points_committed: "النقاط التي تم إحرازها" diff --git a/modules/costs/config/locales/crowdin/ar.yml b/modules/costs/config/locales/crowdin/ar.yml index 7c3bcd5af1..a7ef303bdb 100644 --- a/modules/costs/config/locales/crowdin/ar.yml +++ b/modules/costs/config/locales/crowdin/ar.yml @@ -84,7 +84,7 @@ ar: label_costlog: "تكاليف الوحدة المسجلة" label_cost_plural: "التكاليف" label_cost_type_plural: "أنواع التكلفة" - label_cost_type_specific: "Cost type #%{id}: %{name}" + label_cost_type_specific: "نوع التكلفة #%{id}:%{name}" label_costs_per_page: "التكاليف للصفحة" label_currency: "العملة" label_currency_format: "شكل العملة" @@ -134,7 +134,7 @@ ar: permission_view_own_cost_entries: "عرض تكاليف الحجز الخاصة" permission_view_own_hourly_rate: "عرض الأجور الساعيّة الخاصة" permission_view_own_time_entries: "عرض الوقت الخاص الذي تم قضاؤه" - project_module_costs: "Time and costs" + project_module_costs: "الوقت والتكاليف" text_assign_time_and_cost_entries_to_project: "تعيين الساعات والتكاليف التي تمّ الإبلاغ عنها للمشروع" text_destroy_cost_entries_question: "%{cost_entries} تم الإبلاغ عنها في مجموعات العمل التي توشك أن تلغيها. ماذا تريد أن تفعل؟" text_destroy_time_and_cost_entries: "إلغاء الساعات والتكاليف التي تم الإبلاغ عنها" diff --git a/modules/overviews/config/locales/crowdin/ar.yml b/modules/overviews/config/locales/crowdin/ar.yml index 8acd762539..a536700ce8 100644 --- a/modules/overviews/config/locales/crowdin/ar.yml +++ b/modules/overviews/config/locales/crowdin/ar.yml @@ -1,4 +1,4 @@ ar: overviews: label: 'نظرة عامة' - permission_manage_overview: 'Manage overview page' + permission_manage_overview: 'إدارة صفحة النظرة العامة' diff --git a/modules/team_planner/config/locales/crowdin/ar.yml b/modules/team_planner/config/locales/crowdin/ar.yml index ee41ee18bc..338f03c39a 100644 --- a/modules/team_planner/config/locales/crowdin/ar.yml +++ b/modules/team_planner/config/locales/crowdin/ar.yml @@ -1,13 +1,13 @@ #English strings go here ar: - 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: "عرض مخطط الفريق" + permission_manage_team_planner: "إدارة مخطط الفريق" + project_module_team_planner_view: "مخطط الفريق" team_planner: - label_team_planner: "Team planner" - label_create_new_team_planner: "Create new team planner" - label_team_planner_plural: "Team planners" - label_assignees: "Assignees" + label_team_planner: "مخطط الفريق" + label_create_new_team_planner: "إنشاء مخطط فريق جديد" + label_team_planner_plural: "مخططي الفريق" + label_assignees: "المعينون" upsale: - title: "Team planner" - description: "Team planner gives you a complete overview what each team member is working on, one week at a time. Move, stretch and shrink work packages visually, and even drag them from one assignee to another to organise workload. You can even create new work packages or add existing ones, all from within team planner!" + title: "مخطط الفريق" + description: "يمنحك مخطط الفريق نظرة عامة كاملة على ما يعمل عليه كل عضو في الفريق ، أسبوعًا واحدًا في كل مرة. انقل حزم العمل وتمديدها وتقليصها بصريًا ، بل واسحبها من موظف إلى آخر لتنظيم عبء العمل. يمكنك أيضًا إنشاء حزم عمل جديدة أو إضافة مجموعات موجودة ، كل ذلك من داخل مخطط الفريق!"