Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/duplication #1180

Draft
wants to merge 27 commits into
base: doryphore-dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
8b5fbd6
wip duplication
mrflos May 13, 2024
e65ca0b
feat(duplication) : wip duplication handler
mrflos May 13, 2024
a3f1b75
feat(duplication): local duplication is almost finished
mrflos May 13, 2024
6bed407
feat(duplicate): works for entries and rename manager
mrflos May 13, 2024
486d3cd
feat(duplication): duplicate acls and metadatas
mrflos May 13, 2024
32c1cd2
feat(duplication): make entry duplicate and change field content
mrflos May 13, 2024
cd2807e
feat(duplication): wip UI for external duplication
mrflos May 13, 2024
59a0221
feat(duplication): only admins can duplicate
mrflos May 13, 2024
913acbf
feat(duplication): auth routes and verify url and login for distant d…
mrflos May 13, 2024
6c0ae33
feat(duplication): wip external duplication UI
mrflos May 13, 2024
b7252f4
wip distant duplication new api routes and ux
mrflos May 13, 2024
99269ec
feat(duplication) : wip duplication handler
mrflos May 13, 2024
2f981b0
feat(duplication): external page duplication
mrflos Jun 10, 2024
4f53ed0
fix(controllers): post rebase strange bugs
mrflos Jul 1, 2024
bcbbddd
fix(duplication): netry duplication on distant wiki was not working
mrflos Jul 1, 2024
7d71b7f
Fix missing import
seballot Jul 1, 2024
d3a8890
fix missing }
seballot Jul 1, 2024
ee20fe8
lint
seballot Jul 1, 2024
75f8df7
fix(bazar): allow custom list name for duplication, after merging new…
mrflos Jul 31, 2024
9044d73
feat(duplication): reduce to one button only
mrflos Jul 31, 2024
bf57811
fix(duplication): various fixes from @seballot code review
mrflos Jul 31, 2024
28a666c
fix(duplication): various fixes from @seballot code review 2
mrflos Jul 31, 2024
97bfbdb
fix(duplication): github detected js error
mrflos Aug 5, 2024
a6eb123
fix(duplication): fix redirect after duplication
mrflos Aug 6, 2024
752e0ed
feat(duplication): ui to check if distant form is present
mrflos Aug 12, 2024
4ccbaa8
style(code): global lint after lang imports and phpactor
mrflos Aug 13, 2024
f03ec43
style(lint): index.php
mrflos Sep 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ indent_size = 4

[*.{html,js,json}]
indent_style = space
indent_size = 2
indent_size = 2
4 changes: 4 additions & 0 deletions .phpactor.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"$schema": "/phpactor.schema.json",
"language_server_php_cs_fixer.enabled": true
}
6 changes: 3 additions & 3 deletions actions/newtextsearch.php
Original file line number Diff line number Diff line change
Expand Up @@ -189,13 +189,13 @@ function displayNewSearchResult($string, $phrase, $needles = [])
}
echo '</ol>';

// affichage des résultats en ligne
// affichage des résultats en ligne
} else {
$separator = htmlspecialchars($separator, ENT_COMPAT, YW_CHARSET);
echo '<p>' . _t('SEARCH_RESULT_OF') . ' "', htmlspecialchars($phrase, ENT_COMPAT, YW_CHARSET), '"&nbsp;: ';
foreach ($resultat as $i => $line) {
if ($this->HasAccess('read', $line['tag'])) {
echo (($i > 0) ? $separator : '') . $this->ComposeLinkToPage($line['tag']);
echo(($i > 0) ? $separator : '') . $this->ComposeLinkToPage($line['tag']);
}
}
echo '</p>', "\n";
Expand All @@ -204,4 +204,4 @@ function displayNewSearchResult($string, $phrase, $needles = [])
} else {
echo $this->Format('---- --- **' . _t('NO_SEARCH_RESULT') . '.**');
}
}
}
29 changes: 15 additions & 14 deletions docs/actions/lang/actionsbuilder_en.inc.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

return [
// AB stands for ActionsBuilder
// Commons
Expand Down Expand Up @@ -497,11 +498,11 @@
'AB_bazar_commons2_ordre_option_asc' => 'Ascending',
'AB_bazar_commons2_ordre_option_desc' => 'Descending',
'AB_bazar_commons2_nb_label' => 'Limitation',
'AB_bazar_commons2_nb_hint' => "Limit the number of entries displayed",
'AB_bazar_commons2_nb_hint' => 'Limit the number of entries displayed',
'AB_bazar_commons2_query_label' => 'Query (advanced)',
'AB_bazar_commons2_filtersresultnb_label' => 'Display the number of entries found by filters',
'AB_bazar_commons2_resetfiltersbutton_label' => 'Button to reset filters',
'AB_bazar_commons2_showexportbuttons' => "Export button (CSV, JSON...)",
'AB_bazar_commons2_showexportbuttons' => 'Export button (CSV, JSON...)',
'AB_bazar_commons2_title' => 'Filters',
'AB_bazar_commons2_showmapinlistview_label' => 'Present a card associated with each entry',
'AB_bazar_facettes_btn-label-add' => 'Add a filter',
Expand All @@ -519,9 +520,9 @@
'AB_bazarcarto_spider_label' => 'Spider mode',
'AB_bazarcarto_zoommolette_label' => 'Enable zooming with the scroll wheel',
'AB_bazaragenda_label' => 'Agenda',
'AB_bazaragenda_description' => "The entries will display as events in a calendar.",
'AB_bazaragenda_description' => 'The entries will display as events in a calendar.',
'AB_bazaragenda_nbcol_label' => 'Number of columns',
'AB_bazaragenda_modal_label' => "Display a modal window on click",
'AB_bazaragenda_modal_label' => 'Display a modal window on click',
'AB_bazarcard_description' => 'The entries will appear as cards',
'AB_bazarliste_label' => 'List',
'AB_bazarliste_displayfields_title_label' => 'Title area',
Expand Down Expand Up @@ -550,11 +551,11 @@
'AB_bazargaleriephoto_hint' => 'A field of type bf_image is required.',
'AB_bazarlistephotobox_hint' => 'A field of type bf_image is required.',
'AB_attach_no' => 'No',
'AB_attach_size_label' => "Image size",
'AB_attach_size_label' => 'Image size',
'AB_attach_size_small' => 'Small',
'AB_attach_size_medium' => 'Medium',
'AB_attach_size_big' => 'Large',
'AB_attach_size_original' => "Original size",
'AB_attach_size_original' => 'Original size',
'AB_attach_width_label' => 'Width',
'AB_attach_height_label' => 'Height',
'AB_attach_class_label' => 'Class',
Expand All @@ -564,7 +565,7 @@
'AB_buttons_action_button_pull_right' => 'Right',
'AB_attach_link_label' => 'Associated link',
'AB_attach_caption_label' => 'Text displayed on hovering',
'AB_attach_nofullimagelink_label' => "Add a link to only display the full image",
'AB_attach_nofullimagelink_label' => 'Enable to click on the image to display the full image',
'AB_attach_class_position_left' => 'Left',
'AB_attach_class_position_center' => 'Center',
'AB_attach_class_position_right' => 'Right',
Expand All @@ -591,15 +592,15 @@
'AB_bazarcarto_barregestion_label' => 'Entry management bar',
'AB_bazarlisteliens_label' => 'List of links',
'AB_bazarblog_description' => 'The entries will be in the form of a blog.',
'AB_bazarblog_header_label' => "Show the header",
'AB_bazarblog_header_label' => 'Show the header',
'AB_bazarannuaire_label' => 'Directory',
'AB_bazarannuaire_description' => "Displays the entries as an alphabetical directory",
'AB_bazarannuaire_description' => 'Displays the entries as an alphabetical directory',
'AB_bazarcarousel_avecpage_hint' => 'Page will be named PageDessusSlider',
'AB_bazargaleriephoto_label' => 'Picture gallery',
'AB_bazarmail_label' => 'Write to all',
'AB_attach_commons_title' => 'For images',
'AB_attach_class_position_none' => 'Text below',
'AB_attach_class_izmir_hint' => "And much more effects available on https://ciar4n.com/izmir",
'AB_attach_class_izmir_hint' => 'And much more effects available on https://ciar4n.com/izmir',
'AB_attach_class_izmir_border' => 'Border',
'AB_attach_class_izmir_revealup' => 'Pop-up text',
'AB_advanced_action_listusers_last_label' => 'List only the last accounts created',
Expand All @@ -611,11 +612,11 @@
'AB_advanced_action_interwikilist_label' => 'Show interwiki list',
'AB_advanced_action_mychanges_label' => 'Show me my changes',
'AB_advanced_action_textsearch_label_label' => 'label to be displayed in front of the input area',
'AB_advanced_action_login_signupurl_label' => "Registration Url",
'AB_advanced_action_login_signupurl_label' => 'Registration Url',
'AB_advanced_action_login_profileurl_label' => 'Profile Url',
'AB_buttons_action_button_modal_label' => 'Open link content in a popup',
'AB_buttons_action_button_modal_modalbox_hover' => 'On hovering',
'AB_buttons_action_button_hideifnoaccess_label' => "Hide if the user does not have access to the linked page",
'AB_buttons_action_button_hideifnoaccess_label' => 'Hide if the user does not have access to the linked page',
'AB_syndication_action_url_label' => 'RSS feed address',
'AB_syndication_action_template_list' => 'List flow',
'AB_syndication_action_template_list_and_description' => 'Flow as a list with description',
Expand All @@ -625,10 +626,10 @@
'AB_advanced_action_textsearch_label' => 'Search for text',
'AB_advanced_action_pageonlyindex_label' => 'List all pages except bazar entries',
'AB_buttons_action_button_text_default' => 'My button',
'AB_bazarmaterialcard_modal_label' => "Display a modal window on click",
'AB_bazarmaterialcard_modal_label' => 'Display a modal window on click',
'AB_bazarblog_show_date_label' => 'Display creation date',
'AB_bazargogocarto_description' => 'The entries will be in marker format.',
'AB_bazargogocarto_height_label' => "Map height",
'AB_bazargogocarto_height_label' => 'Map height',
'AB_bazargogocarto_width_label' => 'Map width',
'AB_advanced_action_tocjs_size_label' => 'Width',
'AB_advanced_action_login_template_horizontal' => 'Horizontal',
Expand Down
1 change: 1 addition & 0 deletions docs/actions/lang/actionsbuilder_it.inc.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

return [
// AB stands for ActionsBuilder
// Commons
Expand Down
47 changes: 24 additions & 23 deletions docs/actions/lang/actionsbuilder_pt.inc.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

return [
// AB stands for ActionsBuilder
// Commons
Expand Down Expand Up @@ -471,7 +472,7 @@
'AB_bazar_facettes_title_label' => 'Título',
'AB_attach_link_label' => 'Link relacionado',
'AB_attach_caption_label' => 'Texto da miniatura',
'AB_attach_size_label' => "Tamanho de imagem",
'AB_attach_size_label' => 'Tamanho de imagem',
'AB_attach_class_position_left' => 'Esquerda',
'AB_attach_desc_label' => 'Descrição',
'AB_attach_no' => 'Não',
Expand All @@ -489,23 +490,23 @@
'AB_syndication_action_title_label' => 'Título',
'AB_advanced_action_login_template_label' => 'Template',
'AB_MYFAVORITES_TEMPLATE_LABEL' => 'Template',
'AB_bazar_commons_iconfield_label' => "Campo para o ícone",
'AB_bazar_commons_iconfield_label' => 'Campo para o ícone',
'AB_bazar_commons_iconfield_iconprefix_label' => 'Prefixo para ícones',
'AB_bazar_commons_iconfield_iconprefix_hint' => "Se você usar o seletor do ícone, você não precisa deste campo",
'AB_bazar_commons_iconfield_iconprefix_hint' => 'Se você usar o seletor do ícone, você não precisa deste campo',
'AB_bazar_commons_pagination_label' => 'Número de folhas por página',
'AB_bazar_commons_pagination_hint' => 'Deixe vazio para não usar a paginação',
'AB_bazar_commons2_champ_label' => 'Campo para classificação',
'AB_bazar_commons_search_label_dynamic' => 'Pesquisa dinâmica',
'AB_bazar_commons_title' => 'Exposição',
'AB_bazar_commons2_champ_hint' => "É possível fazer pedidos avançados, aprender mais",
'AB_bazar_commons2_champ_hint' => 'É possível fazer pedidos avançados, aprender mais',
'AB_bazar_commons2_filter_on_date_on_current_month' => 'no mês que acontece',
'AB_bazar_commons2_filter_user_as_owner' => "Exibir apenas os plugues atuais do usuário",
'AB_bazar_commons2_filter_user_as_owner' => 'Exibir apenas os plugues atuais do usuário',
'AB_bazar_commons2_filtercolsize_label' => 'Largura do rosto',
'AB_bazar_commons2_filterposition_label' => 'Posição faceta',
'AB_bazar_commons2_groupsexpanded_label' => 'Exposição inicial de facetas',
'AB_bazar_commons2_ordre_option_asc' => 'Croissant',
'AB_bazar_commons2_ordre_option_desc' => 'Descendo',
'AB_bazar_commons2_nb_hint' => "Limita a exibição do número de folhas",
'AB_bazar_commons2_nb_hint' => 'Limita a exibição do número de folhas',
'AB_bazar_commons2_query_label' => 'Pedido (avançado)',
'AB_bazar_commons2_filtersresultnb_label' => 'Mostrar o número de folhas encontradas pelos filtros',
'AB_bazarcarto_description' => 'As cartas estarão na forma de um marcador.',
Expand All @@ -521,10 +522,10 @@
'AB_bazarliste_popupselectedfields_label' => 'Campos para manter no popup',
'AB_bazarcarto_navigation_label' => 'Zoom botões de controle',
'AB_bazarcarto_zoommolette_label' => 'Para ampliar com a roda do mouse',
'AB_bazaragenda_description' => "Os arquivos serão na forma de um evento em uma agenda.",
'AB_bazaragenda_modal_label' => "Exibição de uma janela modal ao clicar",
'AB_bazaragenda_description' => 'Os arquivos serão na forma de um evento em uma agenda.',
'AB_bazaragenda_modal_label' => 'Exibição de uma janela modal ao clicar',
'AB_bazarliste_label' => 'Lista',
'AB_bazarliste_description' => "As cartas estarão na forma de acordeões",
'AB_bazarliste_description' => 'As cartas estarão na forma de acordeões',
'AB_bazarliste_displayfields_text_label' => 'Área de texto',
'AB_bazarliste_displayfields_floating_label' => 'Área flutuante',
'AB_bazarliste_displayfields_visual_label' => 'Área visual',
Expand All @@ -533,13 +534,13 @@
'AB_bazarcard_style_vertical' => 'Vertical',
'AB_bazarcard_style_horizontal' => 'Horizontal',
'AB_bazarlistephotobox_label' => 'Caixa de fotos',
'AB_bazargogocarto_height_label' => "Altura do cartão",
'AB_bazargogocarto_height_label' => 'Altura do cartão',
'AB_attach_size_small' => 'Pequeno',
'AB_attach_attach_title' => 'Parâmetros gerais',
'AB_attach_attach_description' => 'Anexar um arquivo',
'AB_attach_displaypdf_label' => 'Ver o arquivo PDF',
'AB_buttons_action_button_size_big' => 'Grandioso',
'AB_syndication_action_nouvellefenetre_label' => "Os links abrem em uma nova guia",
'AB_syndication_action_nouvellefenetre_label' => 'Os links abrem em uma nova guia',
'AB_bazarcard_imgstyle_label' => 'Dimensão da imagem',
'AB_bazarcard_imgstyle_cover' => 'Cubra a área / Rogner',
'AB_BAZAR_MAP_AND_TABLE_LABEL' => 'Mapa e tabela',
Expand Down Expand Up @@ -577,21 +578,21 @@
'AB_bazarblog_label' => 'Blog',
'AB_bazargogocarto_label' => 'Cartografia 2 - GoGocarto',
'AB_attach_legend_label' => 'Lenda',
'AB_attach_nofullimagelink_label' => "Permitir clicar na imagem para exibi-la em grande",
'AB_attach_nofullimagelink_label' => 'Permitir clicar na imagem para exibi-la em grande',
'AB_attach_yes' => 'Sim',
'AB_attach_size_original' => "Tamanho original",
'AB_attach_class_displaylink_label' => "Tipo de abertura de conexão, caso além",
'AB_attach_size_original' => 'Tamanho original',
'AB_attach_class_displaylink_label' => 'Tipo de abertura de conexão, caso além',
'AB_attach_class_displaylink_modalbox' => 'em uma janela',
'AB_attach_class_position_label' => 'Posição',
'AB_attach_class_izmir_zoom' => 'Zoom',
'AB_attach_class_izmir_gradiant' => 'Graduação',
'AB_attach_class_izmir_topcentertext' => 'Texto acima',
'AB_attach_file_hint' => "Para exibir o arquivo em outra página, digite \"Name/NameDeFichier.ext\"",
'AB_attach_video_hint' => "O ID de vídeo corresponde aos números ou letras no final da URL",
'AB_attach_file_hint' => 'Para exibir o arquivo em outra página, digite "Name/NameDeFichier.ext"',
'AB_attach_video_hint' => 'O ID de vídeo corresponde aos números ou letras no final da URL',
'AB_management_themeselector_label' => 'Teste de temas disponíveis',
'AB_advanced_action_progressbar_label' => 'Mostrar uma barra de progresso',
'AB_advanced_action_tocjs_label' => 'Criar um resumo da página',
'AB_advanced_action_login_userpage_label' => "Ir para a página do usuário uma vez conectado",
'AB_advanced_action_login_userpage_label' => 'Ir para a página do usuário uma vez conectado',
'AB_advanced_action_login_lostpasswordurl_label' => 'Url para senhas perdidas',
'AB_advanced_action_login_nobtn_label' => 'Substitua o botão com um link (apenas modal)',
'AB_advanced_action_login_loggedinurl_label' => 'Redirecionar url após conexão bem sucedida',
Expand All @@ -602,10 +603,10 @@
'AB_buttons_action_button_size_medium' => 'Média',
'AB_buttons_action_button_pull_label' => 'Posição',
'AB_syndication_action_template_label' => 'Modelo de visualização',
'AB_syndication_action_template_acordion' => "Fluxo na forma de acordeões",
'AB_syndication_action_template_acordion' => 'Fluxo na forma de acordeões',
'AB_attach_video_url_hint' => 'Substituir servidor e id',
'AB_attach_video_largeur_max_label' => 'Largura máxima',
'AB_attach_pdf_hint' => "Para ver o seu PDF, primeiro carregá-lo em uma página desta wiki e copiar o link aqui.",
'AB_attach_pdf_hint' => 'Para ver o seu PDF, primeiro carregá-lo em uma página desta wiki e copiar o link aqui.',
'AB_management_label' => 'Gestão de YesWiki',
'AB_management_despam_label' => 'Limpeza de páginas recentemente vandalizadas',
'AB_management_editconfig_label' => 'Modifique as configurações do arquivo de configuração',
Expand All @@ -623,15 +624,15 @@
'AB_MYFAVORITES_TEMPLATE_LINKS_WITH_TITLES' => 'Links com títulos',
'AB_MYFAVORITES_TEMPLATE_TILES' => 'Vignetas',
'AB_syndication_main_label' => 'Sindicato / RSS feeds',
'AB_syndication_action_description' => "Sincronizar o feed RSS de um site de terceiros",
'AB_syndication_action_url_hint' => "Você pode adicionar vários fluxos separados de uma vírgula",
'AB_syndication_action_description' => 'Sincronizar o feed RSS de um site de terceiros',
'AB_syndication_action_url_hint' => 'Você pode adicionar vários fluxos separados de uma vírgula',
'AB_syndication_action_formatdate_option_jmh' => 'Dia mês hora',
'AB_syndication_action_formatdate_option_jmah' => 'Dia do mês',
'AB_bazartableau_displayimagesasthumbnails_label' => 'Exibir imagens como uma miniatura',
'AB_bazar_commons_search_fields_label' => 'Campos de pesquisa',
'AB_bazar_commons2_resetfiltersbutton_label' => 'Botão para redefinir filtros',
'AB_bazar_commons2_title' => 'Filtros / Facetas',
'AB_bazar_commons2_showexportbuttons' => "Botões de exportação (CSV, JSON...)",
'AB_bazar_commons2_showexportbuttons' => 'Botões de exportação (CSV, JSON...)',
'AB_bazarcarto_displayfields_markhover_label' => 'Campo para exibir no topo do marcador',
'AB_bazarcarto_smallmarker_label' => 'Pequenos marcadores',
'AB_bazarcarto_spider_label' => 'Modo de aranha',
Expand Down Expand Up @@ -662,7 +663,7 @@
'AB_bazarcarto_coordinates_label' => 'Vista inicial',
'AB_attach_width_label' => 'Largura',
'AB_bazarblog_show_date_label' => 'Ver data de criação',
'AB_attach_class_displaylink_default' => "No separador atual",
'AB_attach_class_displaylink_default' => 'No separador atual',
'AB_attach_class_displaylink_new-window' => 'Em um novo separador',
'AB_advanced_action_tocjs_size_label' => 'Largura',
'AB_MYFAVORITES_TEMPLATE_TABLE' => 'Tabela',
Expand Down
1 change: 1 addition & 0 deletions docs/actions/lang/actionsbuilder_ru.inc.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

return [
// AB stands for ActionsBuilder
// Commons
Expand Down
Loading
Loading