Skip to content

Commit

Permalink
Merge branch 'release/14.5' into bug/57612-work-package-report-export…
Browse files Browse the repository at this point in the history
…-fails-if-work-package-has-unavailable-attachments
  • Loading branch information
as-op authored Sep 3, 2024
2 parents 4213c90 + 6df966b commit 6decead
Show file tree
Hide file tree
Showing 80 changed files with 227 additions and 162 deletions.
1 change: 1 addition & 0 deletions .github/workflows/test-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ jobs:
labels:
- runs-on
- runner=32cpu-linux-x64
- family=m7
- run-id=${{ github.run_id }}
timeout-minutes: 40
env:
Expand Down
4 changes: 2 additions & 2 deletions app/components/work_packages/details/tab_component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
render(Primer::Alpha::UnderlineNav.new(align: :left, label: "Tabs", classes: "op-primer-adjustment--UnderlineNav_spaciousLeft")) do |component|
menu_items.each do |node|
component.with_tab(selected: @tab == node.name,
href: url_for(node.url),
href: helpers.url_for_with_params(**node.url),
test_selector: "wp-details-tab-component--tab-#{node.name}",
data: { turbo: true, turbo_stream: true, turbo_action: "replace" }
) do |c|
Expand All @@ -29,7 +29,7 @@
flex.with_column(classes: "op-work-package-details-tab-component--action") do
render(Primer::Beta::IconButton.new(icon: :x,
tag: :a,
href: url_for(action: :close_split_view),
href: helpers.url_for_with_params(action: :close_split_view),
data: { turbo: true, 'turbo-stream': true },
scheme: :invisible,
test_selector: "wp-details-tab-component--close",
Expand Down
9 changes: 8 additions & 1 deletion app/controllers/activities_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ class ActivitiesController < ApplicationController
include Layout

menu_item :activity
before_action :load_and_authorize_in_optional_project,
before_action :warn_if_no_projects_visible,
:load_and_authorize_in_optional_project,
:verify_activities_module_activated,
:determine_subprojects,
:determine_author,
Expand Down Expand Up @@ -143,4 +144,10 @@ def set_session
session[:activity] = { scope: @activity.scope,
with_subprojects: @with_subprojects }
end

def warn_if_no_projects_visible
unless current_user.allowed_in_any_project?(:view_project_activity)
render_404(message: I18n.t("homescreen.additional.no_visible_projects"))
end
end
end
2 changes: 1 addition & 1 deletion app/controllers/notifications_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def share_upsale

private

def split_view_base_route = notifications_path
def split_view_base_route = notifications_path(request.query_parameters)

def default_breadcrumb; end

Expand Down
6 changes: 6 additions & 0 deletions app/helpers/url_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module UrlHelper
def url_for_with_params(**args)
query = request.query_parameters
url_for(**query.merge(args))
end
end
34 changes: 17 additions & 17 deletions config/locales/crowdin/cs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,8 @@ cs:
no_results_title_text: V současné době nejsou žádné projekty
no_results_content_text: Vytvořit nový projekt
search:
label: Project name filter
placeholder: Search by project name
label: Filtr názvu projektu
placeholder: Hledat podle názvu projektu
lists:
active: "Aktivní projekty"
my: "Moje projekty"
Expand Down Expand Up @@ -638,7 +638,7 @@ cs:
possible_values: "Možné hodnoty"
regexp: "Regulární výraz"
searchable: "Vyhledávatelné"
admin_only: "Admin-only"
admin_only: "Pouze pro správce"
custom_value:
value: "Hodnota"
doorkeeper/application:
Expand Down Expand Up @@ -708,7 +708,7 @@ cs:
versions: "Verze"
work_packages: "Pracovní balíčky"
project_custom_field:
is_required: "Required for all projects"
is_required: "Vyžadováno pro všechny projekty"
custom_field_section: Sekce
query:
column_names: "Sloupce"
Expand Down Expand Up @@ -1021,7 +1021,7 @@ cs:
status:
attributes:
default_done_ratio:
inclusion: "must be between 0 and 100."
inclusion: "musí být mezi 0 a 100."
readonly_default_exlusive: "nelze aktivovat pro stavy, které jsou označeny jako výchozí."
time_entry:
attributes:
Expand Down Expand Up @@ -1055,10 +1055,10 @@ cs:
format: "%{message}"
done_ratio:
does_not_match_work_and_remaining_work: "does not match Work and Remaining work"
cannot_be_set_when_work_is_zero: "cannot be set when Work is 0h"
cannot_be_set_when_work_is_zero: "nelze nastavit, když je práce 0h"
must_be_set_when_remaining_work_is_set: "required when Remaining work is set."
must_be_set_when_work_and_remaining_work_are_set: "required when Work and Remaining work are set."
inclusion: "must be between 0 and 100."
inclusion: "musí být mezi 0 a 100."
due_date:
not_start_date: "není v počátečním datu, i když je to nutné pro milníky."
cannot_be_null: "nelze nastavit na null, protože datum zahájení a trvání je známo "
Expand Down Expand Up @@ -1418,7 +1418,7 @@ cs:
button_view_shared_work_packages: "Zobrazit všechny sdílené pracovní balíčky"
button_manage_roles: "Správa rolí"
button_remove_member: "Odebrat člena"
button_remove_member_and_shares: "Remove member and shares"
button_remove_member_and_shares: "Odstranění člena a sdílení"
button_revoke_work_package_shares: "Zrušit sdílení pracovních balíčků"
button_revoke_access: "Odebrat přístup"
button_revoke_all: "Zrušit vše"
Expand Down Expand Up @@ -1677,7 +1677,7 @@ cs:
error_pdf_failed_to_export: "PDF export nelze uložit: %{error}"
error_token_authenticity: "Nelze ověřit token Cross-Site Request Forgy. Pokusili jste se odeslat data na více prohlížečích nebo kartách? Prosím zavřete všechny panely a zkuste to znovu."
error_work_package_not_found_in_project: "Pracovný balíček nebyl nalezen, nebo nepatří k tomuto projektu"
error_work_package_id_not_found: "The work package was not found."
error_work_package_id_not_found: "Pracovní balíček nebyl nalezen."
error_must_be_project_member: "musí být členem projektu"
error_migrations_are_pending: "Vaše instalace OpenProject čeká na migraci databáze. Pravděpodobně jste při poslední aktualizaci zmeškali migrace. Pro správnou aktualizaci vaší instalace prosím zkontrolujte průvodce aktualizací."
error_migrations_visit_upgrade_guides: "Navštivte prosím naši dokumentaci průvodce aktualizací"
Expand Down Expand Up @@ -1732,7 +1732,7 @@ cs:
xls:
label: "XLS"
columns:
input_label_report: "Add columns to attribute table"
input_label_report: "Přidat sloupce do tabulky atributů"
input_caption_report: "By default all attributes added as columns in the work package list are selected. Long text fields are not available in the attribute table, but can be displayed below it."
input_caption_table: "By default all attributes added as columns in the work package list are selected. Long text fields are not available in table based exports."
pdf:
Expand Down Expand Up @@ -1762,12 +1762,12 @@ cs:
column_width:
label: "Table column width"
options:
narrow: "Narrow"
medium: "Medium"
wide: "Wide"
very_wide: "Very wide"
narrow: "Úzký"
medium: "Střední"
wide: "Široký"
very_wide: "Velmi široký"
paper_size:
label: "Paper size"
label: "Velikost papíru"
caption: "Depending on the chart size more than one page might be exported."
long_text_fields:
input_caption: "By default all long text fields are selected."
Expand All @@ -1776,10 +1776,10 @@ cs:
drag_area_label: "Manage long text fields"
xls:
include_relations:
label: "Include relations"
label: "Zahrnout vztahy"
caption: "This option will create a duplicate of each work package for every relation this has with another work package."
include_descriptions:
label: "Include descriptions"
label: "Zahrnout popisy"
caption: "This option will add a description column in raw format."
your_work_packages_export: "Work packages are being exported"
succeeded: "Export completed"
Expand Down
26 changes: 13 additions & 13 deletions config/locales/crowdin/js-ro.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ ro:
autocomplete_select:
placeholder:
multi: 'Adaugă ”%{name}”'
single: 'Selectaţi "%{name}"'
remove: "Elminaţi \"%{name}\""
single: 'Selectează "%{name}"'
remove: "Elimină ”%{name}"
active: "Activ %{label} %{name}"
backup:
attachments_disabled: Atașamentele nu pot fi incluse deoarece depășesc dimensiunea maximă permisă. Puteți schimba acest lucru prin configurare (necesită o repornire a serverului).
Expand All @@ -55,22 +55,22 @@ ro:
title: Backup OpenProject
options: Opțiuni
include_attachments: Include atașamente
download_backup: Descarcă un backup
download_backup: Descarcă backup
request_backup: Solicită backup
close_popup_title: "Închidere pop-up"
close_filter_title: "Închide filtrul"
close_form_title: "Închide formularul"
button_add_watcher: "Adăugare observator"
button_add: "Adăugare"
button_add_watcher: "Adaugă observator"
button_add: "Adaugă"
button_back: "Înapoi"
button_back_to_list_view: "Înapoi la listă"
button_cancel: "Anulare"
button_cancel: "Anulează"
button_close: "Închide"
button_change_project: "Move to another project"
button_check_all: "Selectează tot"
button_configure-form: "Configurați formularul"
button_confirm: "Confirmă"
button_continue: "Continuaţi"
button_continue: "Continuă"
button_copy: "Copiază"
button_copy_to_clipboard: "Copiză în clipboard"
button_copy_link_to_clipboard: "Copiază link-ul în clipboard"
Expand All @@ -79,9 +79,9 @@ ro:
button_delete: "Șterge"
button_delete_watcher: "Șterge observator"
button_details_view: "Vizualizare detaliată"
button_duplicate: "Duplicare"
button_edit: "Editare"
button_filter: "Filtrare"
button_duplicate: "Dublează"
button_edit: "Editează"
button_filter: "Filtrează"
button_collapse_all: "Restrângere totală"
button_expand_all: "Extindere totală"
button_advanced_filter: "Filtru avansat"
Expand Down Expand Up @@ -134,7 +134,7 @@ ro:
errors:
could_not_load: "Datele pentru afișarea graficului nu au putut fi încărcate. Este posibil să nu aveți permisiunile necesare."
description_available_columns: "Coloane disponibile"
description_current_position: "Sunteți aici: "
description_current_position: "Ești aici: "
description_select_work_package: "Selectaţi pachetul de lucru #%{id}"
description_subwork_package: "Fiu al pachetului de lucru #%{id}"
editor:
Expand Down Expand Up @@ -227,7 +227,7 @@ ro:
email_not_received: "Nu ați primit un e-mail? Puteți retrimite e-mailul cu ajutorul linkului din dreapta."
try_another_email: "Sau încercați cu o altă adresă de e-mail."
next_steps: "Etapele următoare"
resend_link: "Retrimitere"
resend_link: "Retrimite"
resend_success: "E-mailul a fost retrimis. Vă rugăm să vă verificați e-mailurile și să faceți clic pe link-ul de confirmare furnizat."
resend_warning: "Nu s-a putut retrimite e-mailul."
session_timeout: "Sesiunea dvs. a expirat. Vă rugăm să încercați să reîncărcați pagina sau să retrimiteți e-mailul."
Expand Down Expand Up @@ -1293,7 +1293,7 @@ ro:
selected_filter:
all: "Toate Proiectele"
selected: "Numai selecția"
search_placeholder: "Căutare proiect..."
search_placeholder: "Caută proiect..."
include_subprojects: "Includeți toate subproiectele"
tooltip:
include_all_selected: "Proiectul este deja inclus, deoarece opțiunea Includeți toate subproiectele este activată."
Expand Down
Loading

0 comments on commit 6decead

Please sign in to comment.