Merge branch 'release_10' into ilias10_a11y_M43946

Author: abrahammordev

.github/workflows/legacy-ui.yml

@@ -39,6 +39,13 @@ jobs:
           tools: composer:v2
           coverage: none
 
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 24
+
+      - name: "Install npm version 11"
+        run: sudo npm install -g npm@11
+
       - name: Install Node dependencies
         run: npm clean-install --omit-dev --ignore-scripts
 

.github/workflows/style-to-repo_trunk.yml

@@ -2,7 +2,7 @@ name: Build and deploy style files
 on:
   push:
     branches:
-      - "release_9"
+      - "release_10"
 
 jobs:
   style-to-repo:

README.md

@@ -19,7 +19,7 @@ ILIAS can be extended with a lot of Plugins. You find the complete list in the [
 
 ### Community
 
-We have a big [community](http://www.ilias.de/docu/goto.php?target=cat_1444&client_id=docu) and you can get a member of [ILIAS Society](http://www.ilias.de/docu/goto.php?target=cat_1669&client_id=docu).
+We have a big [community](http://www.ilias.de/docu/goto.php?target=cat_1444&client_id=docu) and you can become a member of [ILIAS Society](http://www.ilias.de/docu/goto.php?target=cat_1669&client_id=docu).
 You may even join us at one of our regular [ILIAS Conferences](http://www.ilias.de/docu/goto.php?target=cat_2255&client_id=docu).
 
 
@@ -29,4 +29,4 @@ Information on our software development processes and guidelines and ways to con
 
 
 ### ILIAS Root Directory
-Requests to add new files and directories in the root directory of ILIAS MUST be presented as development issues at and approved by the Jour Fixe.
+Requests to add new files and directories in the root directory of ILIAS MUST be presented as development issues at and approved by the Jour Fixe.

components/ILIAS/AccessControl/classes/class.ilClaimingPermissionHelper.php

@@ -231,7 +231,7 @@ protected function checkPlugins(
             $a_action_sub_id = is_null($a_action_sub_id)
                 ? ilAdvancedMDPermissionHelper::SUBACTION_UNDEFINED
                 : $a_action_sub_id;
-            if (!$plugin->checkPermission($this->getUserId(), $a_context_type, $a_context_id, $a_action_id, $a_action_sub_id)) {
+            if (!$plugin->checkPermission($this->getUserId(), $a_context_type, (int) $a_context_id, $a_action_id, $a_action_sub_id)) {
                 $valid = false;
                 break;
             }

components/ILIAS/AccessControl/classes/class.ilPermissionGUI.php

@@ -914,17 +914,26 @@ public function owner(): void
     {
         $this->__initSubTabs('owner');
 
-        $form = new ilPropertyFormGUI();
-        $form->setFormAction($this->ctrl->getFormAction($this, "owner"));
-        $form->setTitle($this->lng->txt("info_owner_of_object"));
+        $this->tpl->setOnScreenMessage('info', $this->lng->txt('chown_warning'));
 
-        $login = new ilTextInputGUI($this->lng->txt("login"), "owner");
-        $login->setDataSource($this->ctrl->getLinkTargetByClass([get_class($this),
-                                                                      'ilRepositorySearchGUI'
-        ], 'doUserAutoComplete', '', true));
+        $form = new ilPropertyFormGUI();
+        $form->setFormAction($this->ctrl->getFormAction($this, 'owner'));
+        $form->setTitle($this->lng->txt('info_owner_of_object'));
+
+        $login = new ilTextInputGUI($this->lng->txt('login'), 'owner');
+        $login->setDataSource(
+            $this->ctrl->getLinkTargetByClass(
+                [
+                    $this::class,
+                    ilRepositorySearchGUI::class
+                ],
+                'doUserAutoComplete',
+                '',
+                true
+            )
+        );
         $login->setRequired(true);
         $login->setSize(50);
-        $login->setInfo($this->lng->txt("chown_warning"));
         $login->setValue(ilObjUser::_lookupLogin($this->gui_obj->getObject()->getOwner()));
         $form->addItem($login);
         $form->addCommandButton("changeOwner", $this->lng->txt("change_owner"));

components/ILIAS/AccessControl/src/Log/Table.php

@@ -214,7 +214,10 @@ private function applyFilterValuesTrafos(array $filter_values): array
     private function buildChangeColumn(int $action, array $data): string
     {
         if ($action === \ilRbacLog::CHANGE_OWNER) {
-            $user_name = \ilObjUser::_lookupFullname($data[0] ?? 0);
+
+            $user_name = isset($data[0]) && is_numeric($data[0])
+                ? \ilObjUser::_lookupFullname((int) $data[0])
+                : '';
             return "{$this->lng->txt('rbac_log_changed_owner')}: {$user_name}";
         }
 

components/ILIAS/Accordion/Accordion.php

@@ -34,9 +34,5 @@ public function init(
     ): void {
         $contribute[Component\Resource\PublicAsset::class] = fn() =>
             new Component\Resource\ComponentJS($this, "accordion.js");
-        /* This library was missing after discussing dependencies for ILIAS 10
-        $contribute[Component\Resource\PublicAsset::class] = static fn() =>
-            new Component\Resource\NodeModule("owl.carousel/dist/owl.carousel.js");
-        */
     }
 }

components/ILIAS/Accordion/classes/class.ilAccordionGUI.php

@@ -44,9 +44,6 @@ class ilAccordionGUI
     protected string $containerclass = "";
     protected string $id = "";
     protected bool $head_class_set = false;
-    public static string $owl_path = "./node_modules/owl.carousel/dist";
-    public static string $owl_js_path = "/owl.carousel.js";
-    public static string $owl_css_path = "/assets/owl.carousel.css";
     protected ilGlobalTemplateInterface $main_tpl;
     protected string $active_headerclass = "";
     protected string $behaviour = self::FIRST_OPEN;
@@ -228,10 +225,6 @@ public static function addJavaScript(ilGlobalTemplate $main_tpl = null): void
             $tpl = $DIC["tpl"];
         }
 
-        ilYuiUtil::initConnection($tpl);
-
-        iljQueryUtil::initjQueryUI($tpl);
-
         foreach (self::getLocalJavascriptFiles() as $f) {
             $tpl->addJavaScript($f, true, 3);
         }
@@ -260,16 +253,14 @@ public static function getLocalJavascriptFiles(): array
             );
         }
         return array(
-            "assets/js/accordion.js",
-            "assets/js" . self::$owl_js_path
+            "assets/js/accordion.js"
         );
     }
 
     public static function getLocalCssFiles(): array
     {
         return array(
-            "./components/ILIAS/Accordion/css/accordion.css",
-            self::$owl_path . self::$owl_css_path
+            "./components/ILIAS/Accordion/css/accordion.css"
         );
     }
 

components/ILIAS/AdministrativeNotification/classes/Table.php

@@ -31,7 +31,7 @@
 use ILIAS\UI\URLBuilderToken;
 
 /**
- *
+ * @author Fabian Schmid <fabian@sr.solutions>
  */
 class Table
 {
@@ -45,11 +45,12 @@ class Table
     private ilLanguage $lng;
     private URLBuilder $url_builder;
     private URLBuilderToken $id_token;
+    private bool $write_access;
 
     protected array $components = [];
 
     public function __construct(
-        private ilADNNotificationGUI $calling_gui,
+        private ilADNNotificationGUI $calling_gui
     ) {
         global $DIC;
         $this->ui_factory = $DIC['ui.factory'];
@@ -58,14 +59,15 @@ public function __construct(
         $this->lng = $DIC['lng'];
 
         $this->url_builder = $this->initURIBuilder();
+        $this->write_access = (new ilObjAdministrativeNotificationAccess())->hasUserPermissionTo('write');
         $columns = $this->initColumns();
         $actions = $this->initActions();
         $data_retrieval = new DataRetrieval(
-            (new ilObjAdministrativeNotificationAccess())->hasUserPermissionTo('write')
+            $this->write_access
         );
 
         $this->components[] = $this->ui_factory->table()->data(
-            $this->lng->txt('notifications'),
+            $this->lng->txt('msg_table_title'),
             $columns,
             $data_retrieval
         )->withActions($actions)->withRequest(
@@ -105,6 +107,10 @@ protected function initColumns(): array
 
     protected function initActions(): array
     {
+        if ($this->write_access === false) {
+            return [];
+        }
+
         return [
             self::ACTION_EDIT => $this->ui_factory->table()->action()->single(
                 $this->lng->txt("btn_edit"),

components/ILIAS/AdministrativeNotification/classes/class.ilObjAdministrativeNotificationAccess.php

@@ -17,8 +17,7 @@
  *********************************************************************/
 
 /**
- * Class ilObjAdministrativeNotificationAccess
- * @author Fabian Schmid <fs@studer-raimann.ch>
+ * @author Fabian Schmid <fabian@sr.solutions>
  */
 class ilObjAdministrativeNotificationAccess extends ilObjectAccess
 {
@@ -48,8 +47,14 @@ public function checkAccessAndThrowException(string $permission): void
         }
     }
 
-    public function hasUserPermissionTo(string $permission): bool
+    public function hasUserPermissionTo(string $permissions_string): bool
     {
-        return $this->rbacsystem->checkAccess($permission, $this->ref_id);
+        $permissions = explode(',', $permissions_string);
+        foreach ($permissions as $permission) {
+            if ($this->rbacsystem->checkAccess($permission, $this->ref_id)) {
+                return true;
+            }
+        }
+        return false;
     }
 }