From 738601c1e68eddb2802fc587c3aff519c8f2a496 Mon Sep 17 00:00:00 2001 From: Curtis Conard Date: Wed, 4 Oct 2023 10:08:14 -0400 Subject: [PATCH 01/14] fix enable maintenance cli fixes #15543 --- src/Console/Maintenance/EnableMaintenanceModeCommand.php | 2 +- src/DBmysql.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Console/Maintenance/EnableMaintenanceModeCommand.php b/src/Console/Maintenance/EnableMaintenanceModeCommand.php index 47937b9fbce..cdc60275aca 100644 --- a/src/Console/Maintenance/EnableMaintenanceModeCommand.php +++ b/src/Console/Maintenance/EnableMaintenanceModeCommand.php @@ -69,7 +69,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $values = [ 'maintenance_mode' => '1' ]; - if ($input->hasOption('text')) { + if ($input->hasOption('text') && $input->getOption('text') !== null) { $values['maintenance_text'] = Sanitizer::sanitize($input->getOption('text')); } $config = new Config(); diff --git a/src/DBmysql.php b/src/DBmysql.php index fed27eb58ac..77d5913c91c 100644 --- a/src/DBmysql.php +++ b/src/DBmysql.php @@ -1421,6 +1421,9 @@ public function buildUpdate($table, $params, $clauses, array $joins = []) if (!count($clauses['WHERE'])) { throw new \RuntimeException('Cannot run an UPDATE query without WHERE clause!'); } + if (!count($params)) { + throw new \RuntimeException('Cannot run an UPDATE query without parameters!'); + } $query = "UPDATE " . self::quoteName($table); From f1dbbb17ede65adaa5cd068e421d24d8f5c7586b Mon Sep 17 00:00:00 2001 From: Romain B <8530352+Rom1-B@users.noreply.github.com> Date: Wed, 4 Oct 2023 16:11:30 +0200 Subject: [PATCH 02/14] fix(planning external event): prevent errors --- src/PlanningExternalEvent.php | 2 +- src/User.php | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/PlanningExternalEvent.php b/src/PlanningExternalEvent.php index 4c3b0d716d0..9bdaae1bb48 100644 --- a/src/PlanningExternalEvent.php +++ b/src/PlanningExternalEvent.php @@ -157,7 +157,7 @@ public function showForm($ID, array $options = []) $this->showFormHeader($options); $is_ajax = isset($options['from_planning_edit_ajax']) && $options['from_planning_edit_ajax']; - $is_rrule = strlen($this->fields['rrule']) > 0; + $is_rrule = strlen($this->fields['rrule'] ?? '') > 0; // set event for another user if ( diff --git a/src/User.php b/src/User.php index 331a1b04b52..4bb8798989f 100644 --- a/src/User.php +++ b/src/User.php @@ -4565,6 +4565,9 @@ public static function dropdown($options = []) // Make a select box with all glpi users $view_users = self::canView(); + $default = ''; + $valuesnames = []; + if (!$p['multiple']) { $user = getUserName($p['value'], 2, true); @@ -4585,11 +4588,12 @@ public static function dropdown($options = []) } } else { // get multiple values name - $valuesnames = []; foreach ($p['values'] as $value) { if (!empty($value) && ($value > 0)) { $user = getUserName($value, 2); $valuesnames[] = $user["name"]; + } else { + unset($p['values'][$value]); } } From 1735a23bcb8adfebfa065bc68a774a8e2c251de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Wed, 4 Oct 2023 16:42:17 +0200 Subject: [PATCH 03/14] Fix LDAP unlimited timeout value (#15703) * Fix LDAP unlimited timeout value * Revert "Fix LDAP unlimited timeout value" This reverts commit 2ead8190ea6c0528e83b36b1b7fe728673c84628. * Prevent useless `ldap_set_option` call --- src/AuthLDAP.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/AuthLDAP.php b/src/AuthLDAP.php index 3aebcdf9ede..ca59122e3bf 100644 --- a/src/AuthLDAP.php +++ b/src/AuthLDAP.php @@ -3088,9 +3088,14 @@ public static function connectToServer( LDAP_OPT_PROTOCOL_VERSION => 3, LDAP_OPT_REFERRALS => 0, LDAP_OPT_DEREF => $deref_options, - LDAP_OPT_NETWORK_TIMEOUT => $timeout ]; + if ($timeout > 0) { + // Apply the timeout unless it is "unlimited" ("unlimited" is the default value defined in `libldap`). + // see https://linux.die.net/man/3/ldap_set_option + $ldap_options[LDAP_OPT_NETWORK_TIMEOUT] = $timeout; + } + foreach ($ldap_options as $option => $value) { if (!@ldap_set_option($ds, $option, $value)) { trigger_error( From 9921a7078236900f9e8b856644959704d305e29f Mon Sep 17 00:00:00 2001 From: Adrien Clairembault <42734840+AdrienClairembault@users.noreply.github.com> Date: Thu, 5 Oct 2023 06:44:44 +0200 Subject: [PATCH 04/14] Add helper method to access the tests root entity (#15717) * Add helper method to access the tests root entity * Use protected method instead * Fix type hint --- tests/GLPITestCase.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/GLPITestCase.php b/tests/GLPITestCase.php index 66e1cb99fa6..939d0a70c4c 100644 --- a/tests/GLPITestCase.php +++ b/tests/GLPITestCase.php @@ -316,4 +316,16 @@ protected function getUniqueInteger() } return $this->int++; } + + /** + * Get the "_test_root_entity" entity created by the tests's bootstrap file + * + * @param bool $only_id + * + * @return Entity|int + */ + protected function getTestRootEntity(bool $only_id = false) + { + return getItemByTypeName('Entity', '_test_root_entity', $only_id); + } } From a4322acdcfa08e49b53bafb4278ce0e6e7c6946e Mon Sep 17 00:00:00 2001 From: Curtis Conard Date: Thu, 5 Oct 2023 02:18:13 -0400 Subject: [PATCH 05/14] fix more dark theme text colors fixes #15645 --- css/includes/components/_select2.scss | 4 ++++ css/legacy/includes/_inputs.scss | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/css/includes/components/_select2.scss b/css/includes/components/_select2.scss index 82163958b12..52fb9e71f57 100644 --- a/css/includes/components/_select2.scss +++ b/css/includes/components/_select2.scss @@ -55,6 +55,10 @@ } } + .select2-selection__rendered input[type="search"] { + color: $input-color; + } + &.select2-selection--single { @include font-size($input-font-size); diff --git a/css/legacy/includes/_inputs.scss b/css/legacy/includes/_inputs.scss index 9e07aa139b7..4ac343bd71b 100644 --- a/css/legacy/includes/_inputs.scss +++ b/css/legacy/includes/_inputs.scss @@ -32,7 +32,7 @@ */ textarea:not(.form-control), input:not(.submit):not(.form-control):not([type=submit]):not([type=color]):not([type=reset]):not([type=checkbox]):not([type=radio]):not(.select2-search__field):not(.numInput):not(.tox-textfield) { - color: $body-color; + color: $input-color; background-color: $input-bg; background-clip: padding-box; border: $input-border-width solid $input-border-color; From f596e7e9e382135aa4fa8d201d6152531b3c2800 Mon Sep 17 00:00:00 2001 From: Adrien Clairembault <42734840+AdrienClairembault@users.noreply.github.com> Date: Thu, 5 Oct 2023 10:31:33 +0200 Subject: [PATCH 06/14] Allow pending reason edition from new fup/task form --- src/CommonITILTask.php | 2 + src/ITILFollowup.php | 2 + src/PendingReason_Item.php | 99 ++++++- .../timeline/form_followup.html.twig | 18 +- .../timeline/pending_reasons.html.twig | 10 +- tests/functional/PendingReason.class.php | 276 ++++++++++++++++++ 6 files changed, 384 insertions(+), 23 deletions(-) diff --git a/src/CommonITILTask.php b/src/CommonITILTask.php index 9d233c6ec3e..2c695710ccf 100644 --- a/src/CommonITILTask.php +++ b/src/CommonITILTask.php @@ -634,6 +634,8 @@ public function post_addItem() NotificationEvent::raiseEvent('add_task', $this->input["_job"], $options); } + PendingReason_Item::handlePendingReasonUpdateFromNewTimelineItem($this); + // Add log entry in the ITIL object $changes = [ 0, diff --git a/src/ITILFollowup.php b/src/ITILFollowup.php index 37f036a24b0..3a161c58ced 100644 --- a/src/ITILFollowup.php +++ b/src/ITILFollowup.php @@ -284,6 +284,8 @@ public function post_addItem() NotificationEvent::raiseEvent("add_followup", $parentitem, $options); } + PendingReason_Item::handlePendingReasonUpdateFromNewTimelineItem($this); + // Add log entry in the ITILObject $changes = [ 0, diff --git a/src/PendingReason_Item.php b/src/PendingReason_Item.php index 66f0e016960..c475acc150e 100644 --- a/src/PendingReason_Item.php +++ b/src/PendingReason_Item.php @@ -205,17 +205,13 @@ public function getAutoResolvedate() } /** - * Check that the given timeline event is the lastest "pending" action for - * the given item + * Get the lastest "pending" action for the given item * * @param CommonITILObject $item - * @param CommonDBTM $timeline_item - * @return boolean + * @return CommonDBTM|false */ - public static function isLastPendingForItem( - CommonITILObject $item, - CommonDBTM $timeline_item - ): bool { + public static function getLastPendingTimelineItemDataForItem(CommonITILObject $item) + { global $DB; $task_class = $item::getTaskClass(); @@ -257,7 +253,27 @@ public static function isLastPendingForItem( $row = $data->current(); $pending_item = self::getById($row['max_id']); - return $pending_item->fields['items_id'] == $timeline_item->fields['id'] && $pending_item->fields['itemtype'] == $timeline_item::getType(); + return $pending_item; + } + + /** + * Check that the given timeline event is the lastest "pending" action for + * the given item + * + * @param CommonITILObject $item + * @param CommonDBTM $timeline_item + * @return boolean + */ + public static function isLastPendingForItem( + CommonITILObject $item, + CommonDBTM $timeline_item + ): bool { + $pending_item = self::getLastPendingTimelineItemDataForItem($item); + + return + $pending_item->fields['items_id'] == $timeline_item->fields['id'] + && $pending_item->fields['itemtype'] == $timeline_item::getType() + ; } /** @@ -323,6 +339,71 @@ public static function isLastTimelineItem(CommonDBTM $timeline_item): bool return $row['max_date_creation'] == $timeline_item->fields['date_creation']; } + /** + * User might be trying to update the active pending reason by modifying the + * pending reason data in a new timeline item form + * + * This method update the latest pending timeline item if the user has edited + * the pending details while adding a new task or followup + * + * @param CommonDBTM $new_timeline_item + * @return void + */ + public static function handlePendingReasonUpdateFromNewTimelineItem( + CommonDBTM $new_timeline_item + ): void { + $last_pending = self::getLastPendingTimelineItemDataForItem($new_timeline_item->input['_job']); + + // There is no existing pending data on previous timeline items for this ticket + // Nothing to be done here since the goal of this method is to update active pending data + if (!$last_pending) { + return; + } + + // The new timeline item is the latest pending reason + // This mean there was no active pending reason before this timeline item was added + // Nothing to be done here as we don't have any older active pending reason to update + if ( + $last_pending->fields['itemtype'] == $new_timeline_item::getType() + && $last_pending->fields['items_id'] == $new_timeline_item->getID() + ) { + return; + } + + // Pending reason was removed or is not enabled + // Nothing to update here as it was already handled in CommonITILObject::prepareInputForUpdate + if (!($new_timeline_item->input['pending'] ?? 0)) { + return; + } + + // If we reach this point, this mean a timeline item with pending information + // was added on a CommonITILObject which already had pending data + // This mean the user might be trying to update the existing pending reason data + + // Let's check if there is any real updates before going any further + $pending_updates = []; + $fields_to_check_for_updates = ['pendingreasons_id', 'followup_frequency', 'followups_before_resolution']; + foreach ($fields_to_check_for_updates as $field) { + if ( + isset($new_timeline_item->input[$field]) + && $new_timeline_item->input[$field] != $last_pending->fields[$field] + ) { + $pending_updates[$field] = $new_timeline_item->input[$field]; + } + } + + // No actual updates -> nothing to be done + if (count($pending_updates) == 0) { + return; + } + + // Update last pending item and parent + $last_pending_timeline_item = new $last_pending->fields['itemtype'](); + $last_pending_timeline_item->getFromDB($last_pending->fields['items_id']); + self::updateForItem($last_pending_timeline_item, $pending_updates); + self::updateForItem($new_timeline_item->input['_job'], $pending_updates); + } + /** * Handle edit on a "pending action" from an item the timeline * diff --git a/templates/components/itilobject/timeline/form_followup.html.twig b/templates/components/itilobject/timeline/form_followup.html.twig index cc463db0eb0..9c05d6e8a5d 100644 --- a/templates/components/itilobject/timeline/form_followup.html.twig +++ b/templates/components/itilobject/timeline/form_followup.html.twig @@ -216,7 +216,7 @@ {# Fixed min-height ensure no height increase when toggling the pending reason button, as select 2 dropdown are a bit higher than the default footer height #}
{% set pending_reasons %} - {% set show_pending_reasons_actions = item.fields['status'] == constant('CommonITILObject::WAITING') and not has_pending_reason and not add_reopen %} + {% set show_pending_reasons_actions = item.fields['status'] == constant('CommonITILObject::WAITING') and not add_reopen %} {% if get_current_interface() == 'central' and item.isAllowedStatus(item.fields['status'], constant('CommonITILObject::WAITING')) %} - {% if not has_pending_reason %} -
- {{ include('components/itilobject/timeline/pending_reasons.html.twig') }} -
- {% endif %} +
+ {{ include('components/itilobject/timeline/pending_reasons.html.twig') }} +
{% endif %} {% endset %} diff --git a/templates/components/itilobject/timeline/pending_reasons.html.twig b/templates/components/itilobject/timeline/pending_reasons.html.twig index a995b86a267..01298447531 100644 --- a/templates/components/itilobject/timeline/pending_reasons.html.twig +++ b/templates/components/itilobject/timeline/pending_reasons.html.twig @@ -34,6 +34,8 @@ {% import 'components/form/fields_macros.html.twig' as fields %} {% set pending_item = call('PendingReason_Item::getForItem', [subitem, true]) %} +{% set pending_item_parent = call('PendingReason_Item::getForItem', [item, true]) %} +{% set pendingreasons_id = pending_item.fields['pendingreasons_id'] ?? pending_item_parent.fields['pendingreasons_id'] ?? 0 %} {% if subitem.isNewItem() or pending_item or call('PendingReason_Item::isLastTimelineItem', [subitem]) %}
-
+
{% set pendingreasons_frequency_field = call('PendingReason::displayFollowupFrequencyfield', [ - pending_item.fields["followup_frequency"], + pending_item ? pending_item.fields['followup_frequency'] : pending_item_parent.fields['followup_frequency'], "", { 'rand': rand @@ -127,7 +129,7 @@
{% set pendingreasons_resolution_field = call('PendingReason::displayFollowupsNumberBeforeResolutionField', [ - pending_item.fields["followups_before_resolution"], + pending_item ? pending_item.fields['followups_before_resolution'] : pending_item_parent.fields['followups_before_resolution'], "", { 'rand': rand diff --git a/tests/functional/PendingReason.class.php b/tests/functional/PendingReason.class.php index 1c6bb25d94f..c8fe4a78ceb 100644 --- a/tests/functional/PendingReason.class.php +++ b/tests/functional/PendingReason.class.php @@ -450,4 +450,280 @@ public function testRemovePendingAndRevertStatus(): void $this->integer($item->fields['status'])->isEqualTo($status); } } + + /** + * Data provider for testHandlePendingReasonUpdateFromNewTimelineItem + * + * @return iterable + */ + protected function testUpdatesFromNewTimelineItemProvider(): iterable + { + $this->login(); + $entity = getItemByTypeName('Entity', '_test_root_entity', true); + + // Create a set of pending reasons that will be reused in our test cases + list( + $pending_reason1, + $pending_reason2 + ) = $this->createItems(\PendingReason::class, [ + ['entities_id' => $entity, 'is_recursive' => true, 'name' => 'Pending 1'], + ['entities_id' => $entity, 'is_recursive' => true, 'name' => 'Pending 2'], + ]); + + // Case 1: ticket without any pending data + yield [ + 'timeline' => [ + ['type' => ITILFollowup::class, 'pending' => 0], + ['type' => TicketTask::class, 'pending' => 0], + ], + 'expected' => [ + 'status' => CommonITILObject::INCOMING, + ], + ]; + + // Case 2: ticket with a single pending data + yield [ + 'timeline' => [ + [ + 'type' => ITILFollowup::class, + 'pending' => 1, + 'pendingreasons_id' => $pending_reason1->getID(), + 'followup_frequency' => 3 * DAY_TIMESTAMP, + 'followups_before_resolution' => 2, + ], + ], + 'expected' => [ + 'status' => CommonITILObject::WAITING, + 'pendingreasons_id' => $pending_reason1->getID(), + 'followup_frequency' => 3 * DAY_TIMESTAMP, + 'followups_before_resolution' => 2, + // Pending reason is attached to the first followup + 'pending_timeline_index' => 0, + ] + ]; + + // Case 3: ticket with two tasks (of which the first is pending) + yield [ + 'timeline' => [ + [ + 'type' => TicketTask::class, + 'pending' => 1, + 'pendingreasons_id' => $pending_reason1->getID(), + 'followup_frequency' => 3 * DAY_TIMESTAMP, + 'followups_before_resolution' => 2, + ], + ['type' => TicketTask::class], + + ], + 'expected' => [ + 'status' => CommonITILObject::WAITING, + 'pendingreasons_id' => $pending_reason1->getID(), + 'followup_frequency' => 3 * DAY_TIMESTAMP, + 'followups_before_resolution' => 2, + // Pending reason is attached to the first task + 'pending_timeline_index' => 0, + ] + ]; + + // Case 4: ticket with two followups + // The first set the pending data and the second change it + yield [ + 'timeline' => [ + [ + 'type' => ITILFollowup::class, + 'pending' => 1, + 'pendingreasons_id' => $pending_reason1->getID(), + 'followup_frequency' => 3 * DAY_TIMESTAMP, + 'followups_before_resolution' => 2, + ], + [ + 'type' => ITILFollowup::class, + 'pending' => 1, + 'pendingreasons_id' => $pending_reason2->getID(), + 'followup_frequency' => 2 * DAY_TIMESTAMP, + 'followups_before_resolution' => 1, + ], + + ], + 'expected' => [ + 'status' => CommonITILObject::WAITING, + 'pendingreasons_id' => $pending_reason2->getID(), + 'followup_frequency' => 2 * DAY_TIMESTAMP, + 'followups_before_resolution' => 1, + // Pending reason is still attached to the first followup, the second one only edited its value + 'pending_timeline_index' => 0, + ] + ]; + + // Case 5: ticket with two followups + // The first set the pending data and the second remove it + yield [ + 'timeline' => [ + [ + 'type' => ITILFollowup::class, + 'pending' => 1, + 'pendingreasons_id' => $pending_reason1->getID(), + 'followup_frequency' => 3 * DAY_TIMESTAMP, + 'followups_before_resolution' => 2, + ], + [ + 'type' => ITILFollowup::class, + 'pending' => 0, + ], + + ], + 'expected' => [ + 'status' => CommonITILObject::INCOMING, + ] + ]; + + // Case 6: ticket with 3 timeline items + // The first set the pending data, the second remove it and the third add a new pending reason + yield [ + 'timeline' => [ + [ + 'type' => ITILFollowup::class, + 'pending' => 1, + 'pendingreasons_id' => $pending_reason1->getID(), + 'followup_frequency' => 3 * DAY_TIMESTAMP, + 'followups_before_resolution' => 2, + ], + [ + 'type' => TicketTask::class, + 'pending' => 0, + ], + [ + 'type' => ITILFollowup::class, + 'pending' => 1, + 'pendingreasons_id' => $pending_reason2->getID(), + 'followup_frequency' => 0, + 'followups_before_resolution' => 0, + ], + ], + 'expected' => [ + 'status' => CommonITILObject::WAITING, + 'pendingreasons_id' => $pending_reason2->getID(), + 'followup_frequency' => 0 * DAY_TIMESTAMP, + 'followups_before_resolution' => 0, + // Pending reason is attached to the third timeline item + 'pending_timeline_index' => 2, + ] + ]; + + // Case 7: ticket with 2 timeline items + // The first set the pending data and the second send the same data + // This simulate what will be sent if the user does not edit the displayed values + yield [ + 'timeline' => [ + [ + 'type' => ITILFollowup::class, + 'pending' => 1, + 'pendingreasons_id' => $pending_reason1->getID(), + 'followup_frequency' => 3 * DAY_TIMESTAMP, + 'followups_before_resolution' => 2, + ], + [ + 'type' => ITILFollowup::class, + 'pending' => 1, + 'pendingreasons_id' => $pending_reason1->getID(), + 'followup_frequency' => 3 * DAY_TIMESTAMP, + 'followups_before_resolution' => 2, + ], + ], + 'expected' => [ + 'status' => CommonITILObject::WAITING, + 'pendingreasons_id' => $pending_reason1->getID(), + 'followup_frequency' => 3 * DAY_TIMESTAMP, + 'followups_before_resolution' => 2, + // Pending reason is attached to the first timeline item + 'pending_timeline_index' => 0, + ] + ]; + } + + /** + * Test that updates on pending reason data done through new timeline items + * are handled as expected + * + * This validate the "testHandlePendingReasonUpdateFromNewTimelineItem" method + * and its references in ITILFollowup's and CommonITILTask's post_addItem() method + * + * @dataProvider testUpdatesFromNewTimelineItemProvider + * + * @param array $timeline A simple description of the timeline items to create + * and their impact on pending reason data + * @param array $expected The expected state after all timeline items have been + * created + * @return void + */ + public function testHandlePendingReasonUpdateFromNewTimelineItem( + array $timeline, + array $expected + ): void { + // Create test ticket + $ticket = $this->createItem(Ticket::class, [ + 'entities_id' => getItemByTypeName('Entity', '_test_root_entity', true), + 'name' => 'test', + 'content' => 'test', + ]); + + // Insert timeline + $items = []; + foreach ($timeline as $timeline_item) { + // Insert fake content + $timeline_item['content'] = 'test'; + + // Read and prepare itemtype (task or followup) + $itemtype = $timeline_item['type']; + unset($timeline_item['type']); + + if ($itemtype == ITILFollowup::class) { + $timeline_item['itemtype'] = Ticket::class; + $timeline_item['items_id'] = $ticket->getID(); + } else { + $timeline_item['tickets_id'] = $ticket->getID(); + } + $items[] = $this->createItem($itemtype, $timeline_item, [ + 'pending', + 'pendingreasons_id', + 'followup_frequency', + 'followups_before_resolution' + ]); + } + + // Reload ticket + $ticket->getFromDB($ticket->getID()); + + // Compare final ticket state with expected state + $this->integer($ticket->fields['status'])->isEqualTo($expected['status']); + if ($ticket->fields['status'] == CommonITILObject::WAITING) { + // Compute ticket pending data + $last_timeline_item_pending_data = PendingReason_Item::getLastPendingTimelineItemDataForItem($ticket); + $ticket_pending_data = PendingReason_Item::getForItem($ticket); + + // Validate pending data + $keys = ['pendingreasons_id', 'followup_frequency', 'followups_before_resolution']; + foreach ($keys as $key) { + $this + ->integer($last_timeline_item_pending_data->fields[$key]) + ->isEqualTo($expected[$key]) + ; + $this + ->integer($ticket_pending_data->fields[$key]) + ->isEqualTo($expected[$key]) + ; + } + + // Check that pending data is attached to the correct followup + $correct_timeline_item = $items[$expected['pending_timeline_index']]; + $this + ->string($last_timeline_item_pending_data->fields['itemtype']) + ->isEqualTo($correct_timeline_item::getType()) + ; + $this + ->integer($last_timeline_item_pending_data->fields['items_id']) + ->isEqualTo($correct_timeline_item->getID()) + ; + } + } } From 47dd9d2de85e17a6ad067c3e3e6b3a2d029175ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Legastelois?= Date: Thu, 5 Oct 2023 09:55:45 +0200 Subject: [PATCH 07/14] fix: missing an R in the name of a function --- .../Diagnostic/DatabaseSchemaIntegrityChecker.php | 12 ++++++------ .../Diagnostic/DatabaseSchemaIntegrityChecker.php | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/System/Diagnostic/DatabaseSchemaIntegrityChecker.php b/src/System/Diagnostic/DatabaseSchemaIntegrityChecker.php index ef0953622b7..900e44d80d9 100644 --- a/src/System/Diagnostic/DatabaseSchemaIntegrityChecker.php +++ b/src/System/Diagnostic/DatabaseSchemaIntegrityChecker.php @@ -197,8 +197,8 @@ public function getDiff(string $table_name, string $proper_create_table_sql): st { $effective_create_table_sql = $this->getEffectiveCreateTableSql($table_name); - $proper_create_table_sql = $this->getNomalizedSql($proper_create_table_sql); - $effective_create_table_sql = $this->getNomalizedSql($effective_create_table_sql); + $proper_create_table_sql = $this->getNormalizedSql($proper_create_table_sql); + $effective_create_table_sql = $this->getNormalizedSql($effective_create_table_sql); if ($proper_create_table_sql === $effective_create_table_sql) { return ''; @@ -266,7 +266,7 @@ public function checkCompleteSchema( $result = []; foreach ($schema as $table_name => $create_table_sql) { - $create_table_sql = $this->getNomalizedSql($create_table_sql); + $create_table_sql = $this->getNormalizedSql($create_table_sql); if (!$this->db->tableExists($table_name)) { $result[$table_name] = [ @@ -276,7 +276,7 @@ public function checkCompleteSchema( continue; } - $effective_create_table_sql = $this->getNomalizedSql($this->getEffectiveCreateTableSql($table_name)); + $effective_create_table_sql = $this->getNormalizedSql($this->getEffectiveCreateTableSql($table_name)); if ($create_table_sql !== $effective_create_table_sql) { $result[$table_name] = [ 'type' => self::RESULT_TYPE_ALTERED_TABLE, @@ -311,7 +311,7 @@ public function checkCompleteSchema( $unknown_table_iterator = $is_context_valid ? $this->db->listTables('glpi\_%', $unknown_tables_criteria) : []; foreach ($unknown_table_iterator as $unknown_table_data) { $table_name = $unknown_table_data['TABLE_NAME']; - $effective_create_table_sql = $this->getNomalizedSql($this->getEffectiveCreateTableSql($table_name)); + $effective_create_table_sql = $this->getNormalizedSql($this->getEffectiveCreateTableSql($table_name)); $result[$table_name] = [ 'type' => self::RESULT_TYPE_UNKNOWN_TABLE, 'diff' => $this->diff('', $effective_create_table_sql) @@ -375,7 +375,7 @@ protected function getEffectiveCreateTableSql(string $table_name): string * * @return string */ - protected function getNomalizedSql(string $create_table_sql): string + protected function getNormalizedSql(string $create_table_sql): string { $cache_key = md5($create_table_sql); if (array_key_exists($cache_key, $this->normalized)) { diff --git a/tests/units/Glpi/System/Diagnostic/DatabaseSchemaIntegrityChecker.php b/tests/units/Glpi/System/Diagnostic/DatabaseSchemaIntegrityChecker.php index 4009bbfb2ab..62bd5220ee2 100644 --- a/tests/units/Glpi/System/Diagnostic/DatabaseSchemaIntegrityChecker.php +++ b/tests/units/Glpi/System/Diagnostic/DatabaseSchemaIntegrityChecker.php @@ -1285,7 +1285,7 @@ function ($sql) { /** * @dataProvider schemaProvider */ - public function testGetNomalizedSql( + public function testGetNormalizedSql( string $schema, // ignored array $raw_tables, array $normalized_tables, @@ -1306,7 +1306,7 @@ public function testGetNomalizedSql( ); foreach ($raw_tables as $table_name => $raw_sql) { - $this->string($this->callPrivateMethod($this->testedInstance, 'getNomalizedSql', $raw_sql))->isEqualTo($normalized_tables[$table_name]); + $this->string($this->callPrivateMethod($this->testedInstance, 'getNormalizedSql', $raw_sql))->isEqualTo($normalized_tables[$table_name]); } } From cad7edc63a8d494f1fd8061965e4f6ab6de59657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Thu, 5 Oct 2023 10:05:11 +0200 Subject: [PATCH 08/14] Fix handling of null values during updates --- src/CommonDBTM.php | 4 ++-- src/Log.php | 4 ++-- tests/functional/CommonDBTM.php | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/CommonDBTM.php b/src/CommonDBTM.php index 01e6b4f1f7f..27a3da5db9f 100644 --- a/src/CommonDBTM.php +++ b/src/CommonDBTM.php @@ -670,8 +670,8 @@ public function updateInDB($updates, $oldvalues = []) $tobeupdated = []; foreach ($updates as $field) { - if (isset($this->fields[$field])) { - if (isset($oldvalues[$field]) && $this->fields[$field] == $oldvalues[$field]) { + if (array_key_exists($field, $this->fields)) { + if (array_key_exists($field, $oldvalues) && $this->fields[$field] == $oldvalues[$field]) { unset($oldvalues[$field]); } $tobeupdated[$field] = $this->fields[$field]; diff --git a/src/Log.php b/src/Log.php index b5e70c097e3..c97b13d8a93 100644 --- a/src/Log.php +++ b/src/Log.php @@ -154,7 +154,7 @@ public static function constructHistory(CommonDBTM $item, $oldvalues, $values) && ($val2['rightname'] == $item->fields['name']) ) { $id_search_option = $key2; - $changes = [$id_search_option, addslashes($oldval ?? ''), $values[$key]]; + $changes = [$id_search_option, addslashes($oldval ?? ''), $values[$key] ?? '']; } } else if ( ($val2['linkfield'] == $key && $real_type === $item->getType()) @@ -169,7 +169,7 @@ public static function constructHistory(CommonDBTM $item, $oldvalues, $values) $oldval = CommonTreeDropdown::sanitizeSeparatorInCompletename($oldval); $values[$key] = CommonTreeDropdown::sanitizeSeparatorInCompletename($values[$key]); } - $changes = [$id_search_option, addslashes($oldval ?? ''), $values[$key]]; + $changes = [$id_search_option, addslashes($oldval ?? ''), $values[$key] ?? '']; } else { // other cases; link field -> get data from dropdown if ($val2["table"] != 'glpi_auth_tables') { diff --git a/tests/functional/CommonDBTM.php b/tests/functional/CommonDBTM.php index 9195764864c..203b23df350 100644 --- a/tests/functional/CommonDBTM.php +++ b/tests/functional/CommonDBTM.php @@ -924,6 +924,20 @@ public function testUpdate() $this->string($computer->fields['name'])->isIdenticalTo('Computer01 \''); $this->boolean($computer->getFromDB($computerID))->isTrue(); $this->string($computer->fields['name'])->isIdenticalTo('Computer01 \''); + + $this->boolean( + $computer->update(['id' => $computerID, 'name' => null]) + )->isTrue(); + $this->variable($computer->fields['name'])->isIdenticalTo(null); + $this->boolean($computer->getFromDB($computerID))->isTrue(); + $this->variable($computer->fields['name'])->isIdenticalTo(null); + + $this->boolean( + $computer->update(['id' => $computerID, 'name' => 'renamed']) + )->isTrue(); + $this->string($computer->fields['name'])->isIdenticalTo('renamed'); + $this->boolean($computer->getFromDB($computerID))->isTrue(); + $this->string($computer->fields['name'])->isIdenticalTo('renamed'); } From bd1e18495c93a4586615dc5cd4c074d106a188d3 Mon Sep 17 00:00:00 2001 From: Curtis Conard Date: Thu, 5 Oct 2023 05:40:31 -0400 Subject: [PATCH 09/14] Fix rule creation via api (#15692) * fix rule creation via api * rework field choice * add sub_type param * add test * fix previously broken test --- src/Rule.php | 11 +++++---- .../Glpi/Inventory/Assets/VirtualMachine.php | 5 ++++ tests/functional/Rule.php | 23 +++++++++++++++++++ 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/src/Rule.php b/src/Rule.php index 3fb6b6011a6..d00aa3b11ef 100644 --- a/src/Rule.php +++ b/src/Rule.php @@ -2099,9 +2099,6 @@ public function showMinimalForm( **/ public function prepareInputForAdd($input) { - - // Before adding, add the ranking of the new rule - $input["ranking"] = $input['ranking'] ?? $this->getNextRanking(); //If no uuid given, generate a new one if (!isset($input['uuid'])) { $input["uuid"] = self::getUuid(); @@ -2124,21 +2121,25 @@ public function prepareInputForAdd($input) ); } + // Before adding, add the ranking of the new rule + $input["ranking"] = $input['ranking'] ?? $this->getNextRanking($input['sub_type']); + return $input; } /** * Get the next ranking for a specified rule + * @param string|null $sub_type Specific class for the rule. Defaults to the current class at runtime. **/ - public function getNextRanking() + public function getNextRanking(?string $sub_type = null) { global $DB; $iterator = $DB->request([ 'SELECT' => ['MAX' => 'ranking AS rank'], 'FROM' => self::getTable(), - 'WHERE' => ['sub_type' => $this->getType()] + 'WHERE' => ['sub_type' => $sub_type ?? static::class] ]); if (count($iterator)) { diff --git a/tests/functional/Glpi/Inventory/Assets/VirtualMachine.php b/tests/functional/Glpi/Inventory/Assets/VirtualMachine.php index fa8e2b220fe..e0f8825f5fd 100644 --- a/tests/functional/Glpi/Inventory/Assets/VirtualMachine.php +++ b/tests/functional/Glpi/Inventory/Assets/VirtualMachine.php @@ -605,6 +605,11 @@ public function testImportComputerFromVirtualMachine() ]); $this->integer($rules_id)->isGreaterThan(0); + + // Move rule to top ranking so other rules cannot interfere + $collection = new \RuleImportAssetCollection(); + $this->boolean($collection->moveRule($rules_id, 0, \RuleCollection::MOVE_BEFORE))->isTrue(); + $this->integer( $criteria->add([ 'rules_id' => $rules_id, diff --git a/tests/functional/Rule.php b/tests/functional/Rule.php index 45bf9557b79..9950c9acd32 100644 --- a/tests/functional/Rule.php +++ b/tests/functional/Rule.php @@ -652,6 +652,29 @@ public function testRanking() $this->integer($second_rule->fields['ranking'])->isGreaterThan($first_rule->fields['ranking']); } + public function testRankingFromBaseRuleClass() + { + $rule = new \Rule(); + // create a software rule + $add = $rule->add([ + 'sub_type' => 'RuleSoftwareCategory', + 'name' => 'my test rule' + ]); + $this->integer($add)->isGreaterThan(0); + $first_rule = new \RuleSoftwareCategory(); + $this->boolean($first_rule->getFromDB($add))->isTrue(); + $this->integer($first_rule->fields['ranking'])->isGreaterThan(0); + + $add = $rule->add([ + 'sub_type' => 'RuleSoftwareCategory', + 'name' => 'my other test rule' + ]); + $this->integer($add)->isGreaterThan(0); + $second_rule = new \RuleSoftwareCategory(); + $this->boolean($second_rule->getFromDB($add))->isTrue(); + $this->integer($second_rule->fields['ranking'])->isGreaterThan($first_rule->fields['ranking']); + } + public function testAllCriteria() { $classes = $this->getClasses('getCriterias'); From b5e0b8e60c9af3ce80b42432af0cd7bc583e9cb3 Mon Sep 17 00:00:00 2001 From: Curtis Conard Date: Thu, 5 Oct 2023 05:40:59 -0400 Subject: [PATCH 10/14] fix duplicate Computer search options (#15691) * fix duplicate Computer search options * do not blindly merge search opt arrays * fix lint * fix other duplicates --- .../duplicate_searchopt_fixes.php | 47 +++++++++++++++++++ src/Domain.php | 2 +- src/Monitor.php | 2 +- src/Peripheral.php | 2 +- src/Phone.php | 2 +- src/Printer.php | 2 +- src/Project.php | 2 +- src/Search.php | 34 ++++++++++---- 8 files changed, 78 insertions(+), 15 deletions(-) create mode 100644 install/migrations/update_10.0.10_to_10.0.11/duplicate_searchopt_fixes.php diff --git a/install/migrations/update_10.0.10_to_10.0.11/duplicate_searchopt_fixes.php b/install/migrations/update_10.0.10_to_10.0.11/duplicate_searchopt_fixes.php new file mode 100644 index 00000000000..c2870f0e00a --- /dev/null +++ b/install/migrations/update_10.0.10_to_10.0.11/duplicate_searchopt_fixes.php @@ -0,0 +1,47 @@ +. + * + * --------------------------------------------------------------------- + */ + +/** + * @var DB $DB + * @var Migration $migration + */ + +$migration->changeSearchOption('Computer', 129, 1429); +$migration->changeSearchOption('Computer', 130, 1430); +$migration->changeSearchOption('Computer', 131, 1431); +$migration->changeSearchOption('Computer', 132, 1432); + +$migration->changeSearchOption('Domain', 30, 1400); +$migration->changeSearchOption('Project', 119, 1400); diff --git a/src/Domain.php b/src/Domain.php index 7fe327ce059..2bd646e927d 100644 --- a/src/Domain.php +++ b/src/Domain.php @@ -201,7 +201,7 @@ public function rawSearchOptions() ]; $tab[] = [ - 'id' => '30', + 'id' => '1400', 'table' => $this->getTable(), 'field' => 'id', 'name' => __('ID'), diff --git a/src/Monitor.php b/src/Monitor.php index c4f23bbf0e1..0541dc6f166 100644 --- a/src/Monitor.php +++ b/src/Monitor.php @@ -476,7 +476,7 @@ public static function rawSearchOptionsToAdd($itemtype = null) ]; $tab[] = [ - 'id' => '129', + 'id' => '1429', 'table' => 'glpi_computers_items', 'field' => 'id', 'name' => _x('quantity', 'Number of monitors'), diff --git a/src/Peripheral.php b/src/Peripheral.php index 62a64f4d4f7..ee9214c6f9a 100644 --- a/src/Peripheral.php +++ b/src/Peripheral.php @@ -389,7 +389,7 @@ public static function rawSearchOptionsToAdd($itemtype = null) ]; $tab[] = [ - 'id' => '130', + 'id' => '1430', 'table' => 'glpi_computers_items', 'field' => 'id', 'name' => _x('quantity', 'Number of peripherals'), diff --git a/src/Phone.php b/src/Phone.php index 62ae4572321..992867b18a3 100644 --- a/src/Phone.php +++ b/src/Phone.php @@ -476,7 +476,7 @@ public static function rawSearchOptionsToAdd($itemtype = null) ]; $tab[] = [ - 'id' => '132', + 'id' => '1432', 'table' => 'glpi_computers_items', 'field' => 'id', 'name' => _x('quantity', 'Number of phones'), diff --git a/src/Printer.php b/src/Printer.php index 8614b2a8748..c4088472c70 100644 --- a/src/Printer.php +++ b/src/Printer.php @@ -679,7 +679,7 @@ public static function rawSearchOptionsToAdd($itemtype = null) ]; $tab[] = [ - 'id' => '131', + 'id' => '1431', 'table' => 'glpi_computers_items', 'field' => 'id', 'name' => _x('quantity', 'Number of printers'), diff --git a/src/Project.php b/src/Project.php index 4a628774350..c04a49f5248 100644 --- a/src/Project.php +++ b/src/Project.php @@ -1026,7 +1026,7 @@ public function rawSearchOptions() ]; $tab[] = [ - 'id' => '119', + 'id' => '1400', 'table' => ProjectTask::getTable(), 'field' => 'plan_end_date', 'name' => __('Planned end date'), diff --git a/src/Search.php b/src/Search.php index 1f5e0d53e73..898640244b1 100644 --- a/src/Search.php +++ b/src/Search.php @@ -8244,53 +8244,69 @@ public static function &getOptions($itemtype, $withplugins = true) ]; } + $fn_append_options = static function ($new_options) use ($itemtype) { + // Check duplicate keys between new options and existing options + $duplicate_keys = array_intersect(array_keys(self::$search[$itemtype]), array_keys($new_options)); + if (count($duplicate_keys) > 0) { + trigger_error( + sprintf( + 'Duplicate keys found in search options for item type %s: %s', + $itemtype, + implode(', ', $duplicate_keys) + ), + E_USER_WARNING + ); + } + self::$search[$itemtype] += $new_options; + }; + if ( in_array($itemtype, $CFG_GLPI["networkport_types"]) || ($itemtype == AllAssets::getType()) ) { - self::$search[$itemtype] += NetworkPort::getSearchOptionsToAdd($itemtype); + $fn_append_options(NetworkPort::getSearchOptionsToAdd($itemtype)); } if ( in_array($itemtype, $CFG_GLPI["contract_types"]) || ($itemtype == AllAssets::getType()) ) { - self::$search[$itemtype] += Contract::getSearchOptionsToAdd(); + $fn_append_options(Contract::getSearchOptionsToAdd()); } if ( Document::canApplyOn($itemtype) || ($itemtype == AllAssets::getType()) ) { - self::$search[$itemtype] += Document::getSearchOptionsToAdd(); + $fn_append_options(Document::getSearchOptionsToAdd()); } if ( Infocom::canApplyOn($itemtype) || ($itemtype == AllAssets::getType()) ) { - self::$search[$itemtype] += Infocom::getSearchOptionsToAdd($itemtype); + $fn_append_options(Infocom::getSearchOptionsToAdd($itemtype)); } if ( in_array($itemtype, $CFG_GLPI["domain_types"]) || ($itemtype == AllAssets::getType()) ) { - self::$search[$itemtype] += Domain::getSearchOptionsToAdd($itemtype); + $fn_append_options(Domain::getSearchOptionsToAdd($itemtype)); } if ( in_array($itemtype, $CFG_GLPI["appliance_types"]) || ($itemtype == AllAssets::getType()) ) { - self::$search[$itemtype] += Appliance::getSearchOptionsToAdd($itemtype); + $fn_append_options(Appliance::getSearchOptionsToAdd($itemtype)); } if (in_array($itemtype, $CFG_GLPI["link_types"])) { self::$search[$itemtype]['link'] = ['name' => Link::getTypeName(Session::getPluralNumber())]; - self::$search[$itemtype] += Link::getSearchOptionsToAdd($itemtype); + $fn_append_options(Link::getSearchOptionsToAdd($itemtype)); self::$search[$itemtype]['manuallink'] = ['name' => ManualLink::getTypeName(Session::getPluralNumber())]; - self::$search[$itemtype] += ManualLink::getSearchOptionsToAdd($itemtype); + $fn_append_options(ManualLink::getSearchOptionsToAdd($itemtype)); } if ($withplugins) { @@ -8299,7 +8315,7 @@ public static function &getOptions($itemtype, $withplugins = true) $plugsearch = $plugsearch + Plugin::getAddSearchOptionsNew($itemtype); if (count($plugsearch)) { self::$search[$itemtype] += ['plugins' => ['name' => _n('Plugin', 'Plugins', Session::getPluralNumber())]]; - self::$search[$itemtype] += $plugsearch; + $fn_append_options($plugsearch); } } From 4c6283ebb412bcef51a51ec5e38ac17936f2d8d7 Mon Sep 17 00:00:00 2001 From: Rom1-B Date: Thu, 5 Oct 2023 10:07:24 +0200 Subject: [PATCH 11/14] support_29828 --- src/CommonITILTask.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CommonITILTask.php b/src/CommonITILTask.php index 2c695710ccf..ef4b49e9a2d 100644 --- a/src/CommonITILTask.php +++ b/src/CommonITILTask.php @@ -1283,7 +1283,11 @@ public static function genericPopulatePlanning($itemtype, $options = []) /// Specific for tickets $interv[$key]["device"] = []; - if (isset($parentitem->hardwaredatas) && !empty($parentitem->hardwaredatas)) { + if ( + $parentitem instanceof Ticket + && isset($parentitem->hardwaredatas) + && !empty($parentitem->hardwaredatas) + ) { foreach ($parentitem->hardwaredatas as $hardwaredata) { $interv[$key]["device"][$hardwaredata->fields['id']] = ($hardwaredata ? $hardwaredata->getName() : ''); From a41f14f0dce447f23d4d04a06194a85f545a83b2 Mon Sep 17 00:00:00 2001 From: stonebuzz Date: Fri, 6 Oct 2023 13:26:37 +0200 Subject: [PATCH 12/14] fix(Change): handle HTML from searchoption --- src/Change.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Change.php b/src/Change.php index 5ea09ddeb72..5cfed03e016 100644 --- a/src/Change.php +++ b/src/Change.php @@ -510,7 +510,8 @@ public function rawSearchOptions() 'field' => 'impactcontent', 'name' => __('Analysis impact'), 'massiveaction' => false, - 'datatype' => 'text' + 'datatype' => 'text', + 'htmltext' => true ]; $tab[] = [ @@ -519,7 +520,8 @@ public function rawSearchOptions() 'field' => 'controlistcontent', 'name' => __('Control list'), 'massiveaction' => false, - 'datatype' => 'text' + 'datatype' => 'text', + 'htmltext' => true ]; $tab[] = [ @@ -528,7 +530,8 @@ public function rawSearchOptions() 'field' => 'rolloutplancontent', 'name' => __('Deployment plan'), 'massiveaction' => false, - 'datatype' => 'text' + 'datatype' => 'text', + 'htmltext' => true ]; $tab[] = [ @@ -537,7 +540,8 @@ public function rawSearchOptions() 'field' => 'backoutplancontent', 'name' => __('Backup plan'), 'massiveaction' => false, - 'datatype' => 'text' + 'datatype' => 'text', + 'htmltext' => true ]; $tab[] = [ @@ -546,7 +550,8 @@ public function rawSearchOptions() 'field' => 'checklistcontent', 'name' => __('Checklist'), 'massiveaction' => false, - 'datatype' => 'text' + 'datatype' => 'text', + 'htmltext' => true ]; $tab = array_merge($tab, Notepad::rawSearchOptionsToAdd()); From 1b0d4c09d331412d0b9018c7d20b5dfcb1e9a29c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Legastelois?= Date: Mon, 9 Oct 2023 08:26:18 +0200 Subject: [PATCH 13/14] fix: imap folders globalname --- src/MailCollector.php | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/MailCollector.php b/src/MailCollector.php index 7617f5717b9..e3cf6c504c4 100644 --- a/src/MailCollector.php +++ b/src/MailCollector.php @@ -358,16 +358,9 @@ public function showForm($ID, array $options = []) var li = $(this); var input_id = li.data('input-id'); - var folder = li.children('.folder-name').html(); + var folder = li.find('.folder-name').data('globalname'); - var _label = ''; - var _parents = li.parents('li').children('.folder-name'); - for (i = _parents.length -1 ; i >= 0; i--) { - _label += $(_parents[i]).html() + '/'; - } - _label += folder; - - $('#'+input_id).val(_label); + $('#'+input_id).val(folder); var modalEl = $('#'+input_id+'_modal')[0]; var modal = bootstrap.Modal.getInstance(modalEl); @@ -427,10 +420,11 @@ public function displayFoldersList($input_id = "") */ private function displayFolder($folder, $input_id) { - $fname = mb_convert_encoding($folder->getLocalName(), "UTF-8", "UTF7-IMAP"); + $fglobalname = htmlspecialchars(mb_convert_encoding($folder->getGlobalName(), "UTF-8", "UTF7-IMAP"), ENT_QUOTES); + $flocalname = htmlspecialchars(mb_convert_encoding($folder->getLocalName(), "UTF-8", "UTF7-IMAP"), ENT_QUOTES); echo "
  •   - " . $fname . ""; + " . $flocalname . ""; echo "
      "; foreach ($folder as $sfolder) { From b46d23510c9a5edb3d85e689d9e8508e2a91ed2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 11:43:26 +0000 Subject: [PATCH 14/14] Bump styfle/cancel-workflow-action from 0.11.0 to 0.12.0 Bumps [styfle/cancel-workflow-action](https://github.com/styfle/cancel-workflow-action) from 0.11.0 to 0.12.0. - [Release notes](https://github.com/styfle/cancel-workflow-action/releases) - [Commits](https://github.com/styfle/cancel-workflow-action/compare/0.11.0...0.12.0) --- updated-dependencies: - dependency-name: styfle/cancel-workflow-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/cancel_workflow_runs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cancel_workflow_runs.yml b/.github/workflows/cancel_workflow_runs.yml index 63481628c41..f5f30369673 100644 --- a/.github/workflows/cancel_workflow_runs.yml +++ b/.github/workflows/cancel_workflow_runs.yml @@ -15,7 +15,7 @@ jobs: runs-on: "${{ github.repository == 'glpi-network/glpi' && 'self-hosted' || 'ubuntu-latest' }}" steps: - name: "Cancel outdated workflow runs" - uses: "styfle/cancel-workflow-action@0.11.0" + uses: "styfle/cancel-workflow-action@0.12.0" with: all_but_latest: true workflow_id: ${{ github.event.workflow.id }}