diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml new file mode 100644 index 000000000..46095c66c --- /dev/null +++ b/.github/workflows/action.yml @@ -0,0 +1,16 @@ +name: Add PRs to Combodo PRs Dashboard + +on: + pull_request_target: + types: + - opened + +jobs: + add-to-project: + name: Add PR to Combodo Project + runs-on: ubuntu-latest + steps: + - uses: actions/add-to-project@v1.0.2 + with: + project-url: https://github.com/orgs/Combodo/projects/5 + github-token: ${{ secrets.PR_AUTOMATICALLY_ADD_TO_PROJECT }} diff --git a/datamodels/2.x/itop-portal-base/portal/public/js/portal_form_handler.js b/datamodels/2.x/itop-portal-base/portal/public/js/portal_form_handler.js index 1b1843cf6..5c16e862d 100644 --- a/datamodels/2.x/itop-portal-base/portal/public/js/portal_form_handler.js +++ b/datamodels/2.x/itop-portal-base/portal/public/js/portal_form_handler.js @@ -67,8 +67,8 @@ $(function() // revert other modifications here _destroy: function() { - this.element - .removeClass('portal_form_handler'); + this._unregisterBlockers(); + this.element.removeClass('portal_form_handler'); }, // _setOptions is called with a hash of all options that are changing // always refresh when changing options diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php index 9d571c6f5..0406f7178 100644 --- a/dictionaries/fr.dictionary.itop.ui.php +++ b/dictionaries/fr.dictionary.itop.ui.php @@ -1272,14 +1272,14 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé 'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Récents', 'UI:Search:AutoSubmit:DisabledHint' => 'La soumission automatique a été desactivée pour cette classe', 'UI:Search:Count_ObjectsOf_Class_Found' => 'Trouvé %1$d objet(s) de type %2$s.', - 'UI:Search:Criteria:DateTime:From' => 'Depuis', - 'UI:Search:Criteria:DateTime:FromTime' => 'Depuis', + 'UI:Search:Criteria:DateTime:From' => 'Du', + 'UI:Search:Criteria:DateTime:FromTime' => 'Du', 'UI:Search:Criteria:DateTime:PlaceholderFrom' => 'Indifférent', 'UI:Search:Criteria:DateTime:PlaceholderFromTime' => 'Indifférent', 'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Indifférent', 'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Indifférent', - 'UI:Search:Criteria:DateTime:Until' => 'jusqu\'à', - 'UI:Search:Criteria:DateTime:UntilTime' => 'jusqu\'à', + 'UI:Search:Criteria:DateTime:Until' => 'au', + 'UI:Search:Criteria:DateTime:UntilTime' => 'au', 'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => 'Children of the selected objects will be included.~~', 'UI:Search:Criteria:Locked' => 'Verrouillé', 'UI:Search:Criteria:Numeric:From' => 'De', diff --git a/dictionaries/ui/pages/notifications-center/fr.dictionary.itop.notifications-center.php b/dictionaries/ui/pages/notifications-center/fr.dictionary.itop.notifications-center.php index 91ae18c59..c1e7bceb9 100644 --- a/dictionaries/ui/pages/notifications-center/fr.dictionary.itop.notifications-center.php +++ b/dictionaries/ui/pages/notifications-center/fr.dictionary.itop.notifications-center.php @@ -13,7 +13,7 @@ Dict::Add('FR FR', 'French', 'Français', [ 'UI:NotificationsCenter:Advanced:Input:Label' => '%1$s: %2$s', 'UI:NotificationsCenter:Channel:OutOf:Text' => '%1$s sur %2$s', 'UI:NotificationsCenter:Page:Title' => 'Notifications', - 'UI:NotificationsCenter:Panel:SubTitle' => 'Gérer les Notifications dont vous êtes destinataire : désinscrivez-vous ou limitez les à un seul canal', + 'UI:NotificationsCenter:Panel:SubTitle' => 'Gérer les Notifications dont vous êtes destinataire : désabonnez-vous des news, des méls ou des deux', 'UI:NotificationsCenter:Panel:Toolbar:ViewAllNews:Title' => 'Voir toutes mes news', 'UI:NotificationsCenter:Panel:Table:Channels' => 'Canaux', 'UI:NotificationsCenter:Panel:Title' => 'Notifications', diff --git a/pages/UI.php b/pages/UI.php index dee5a471f..614e44016 100644 --- a/pages/UI.php +++ b/pages/UI.php @@ -6,14 +6,12 @@ use Combodo\iTop\Application\Helper\Session; use Combodo\iTop\Application\TwigBase\Twig\TwigHelper; -use Combodo\iTop\Application\UI\Base\Component\Alert\AlertUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Button\ButtonUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Form\Form; use Combodo\iTop\Application\UI\Base\Component\GlobalSearch\GlobalSearchHelper; use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory; -use Combodo\iTop\Application\UI\Base\Component\Title\Title; use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Toolbar\ToolbarUIBlockFactory; use Combodo\iTop\Application\UI\Base\Layout\PageContent\PageContentFactory; @@ -22,10 +20,10 @@ use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory; use Combodo\iTop\Application\WebPage\ErrorPage; use Combodo\iTop\Application\WebPage\iTopWebPage; use Combodo\iTop\Application\WebPage\WebPage; +use Combodo\iTop\Application\WelcomePopup\WelcomePopupService; use Combodo\iTop\Controller\Base\Layout\ObjectController; use Combodo\iTop\Controller\WelcomePopupController; use Combodo\iTop\Service\Router\Router; -use Combodo\iTop\Application\WelcomePopup\WelcomePopupService; /** * Displays a popup welcome message, once per session at maximum @@ -660,7 +658,7 @@ try $oP->add("

".Dict::Format('UI:FullTextSearchTitle_Text', utils::EscapeHtml($sFullText))."

"); $oP->add("\n"); $oP->add("\n"); - $sJSClass = addslashes($sClassName); + $sJSClass = addslashes($sClassName ?? ''); $sJSNeedles = json_encode($aFullTextNeedles); $oP->add_ready_script( <<GenerateUrl(NotificationsCenterController::ROUTE_NAMESPACE.'.display_page'), ); $oBulkActionsBlock->SetToolBlocks([$oNotificationsCenterButton]);