move some rules ui to twig (#15360)

* move some rules ui to twig * lint * improve preview * remove size attr
glpi-project · Sep 2, 2023 · 1527aaf · 1527aaf
1 parent babaca1
commit 1527aaf
Show file tree

Hide file tree

Showing 13 changed files with 578 additions and 394 deletions.
diff --git a/front/rule.php b/front/rule.php
@@ -41,16 +41,6 @@
 
 Html::header(Rule::getTypeName(Session::getPluralNumber()), $_SERVER['PHP_SELF'], "admin", "rule", -1);
 
-echo TemplateRenderer::getInstance()->render(
-    'pages/admin/rules_list.html.twig',
-    [
-        'rules_group' => [
-            [
-                'type'    => __('Rule type'),
-                'entries' => RuleCollection::getRules(),
-            ],
-        ]
-    ]
-);
+RuleCollection::showCollectionsList();
 
 Html::footer();
diff --git a/src/Application/View/Extension/PhpExtension.php b/src/Application/View/Extension/PhpExtension.php
@@ -80,12 +80,12 @@ public function phpConfig(string $name)
     /**
      * Call function of static method.
      *
-     * @param string $callable
+     * @param string|array $callable
      * @param array $parameters
      *
      * @return mixed
      */
-    public function call(string $callable, array $parameters = [])
+    public function call(string|array $callable, array $parameters = [])
     {
         if (is_callable($callable)) {
             return call_user_func_array($callable, $parameters);

diff --git a/src/Rule.php b/src/Rule.php
@@ -2642,7 +2642,7 @@ public function displayCriteriaSelectPattern($name, $ID, $condition, $value = ""
             !$display
             && ($rc = getItemForItemtype($this->rulecriteriaclass))
         ) {
-            echo Html::input($name, ['value' => $value, 'size' => '70']);
+            echo Html::input($name, ['value' => $value]);
         }
     }