Added possibility to cancel multiple tasks case

Added null parameter possibility Added project type to webservices ProcessList test form Added category_guid in processList() return Added process category guid to webservices ProcessList test form Changed EOL to LF for some files in php-library-glpi set version to 3.3.0-community-RE-2.8
tomolimo · Jan 14, 2025 · 3101cc2 · 3101cc2
1 parent 6f8e4d6
commit 3101cc2
Show file tree

Hide file tree

Showing 18 changed files with 1,307 additions and 1,278 deletions.
diff --git a/workflow/engine/classes/WsBase.php b/workflow/engine/classes/WsBase.php
@@ -131,16 +131,19 @@ public function processList()
                 $result[] = array(
                     'guid' => $aRow['PRO_UID'],
                     'name' => $arrayProcess['PRO_TITLE'],
-                    'project_type' => in_array($aRow['PRO_UID'], $bpmnProjects) ? 'bpmn' : 'classic'
+                    'project_type' => in_array($aRow['PRO_UID'], $bpmnProjects) ? 'bpmn' : 'classic',
+                    'category_guid' => $aRow['PRO_CATEGORY']
                 );
                 $oDataset->next();
             }
 
             return $result;
         } catch (Exception $e) {
             $result[] = array(
-                'guid' => $e->getMessage(),
-                'name' => $e->getMessage()
+                'guid'          => $e->getMessage(),
+                'name'          => $e->getMessage(),
+                'project_type'  => '',
+                'category_guid' => ''
             );
 
             return $result;
@@ -3098,6 +3101,13 @@ public function cancelCase($caseUid, $delIndex, $userUid)
             /** If those parameters are null we will to force the cancelCase */
             if (is_null($delIndex) && is_null($userUid)) {
                 /*----------------------------------********---------------------------------*/
+                $case->cancelCase($caseUid);
+
+                //Define the result of the cancelCase
+                $result = self::messageExecuteSuccessfully();
+                $g->sessionVarRestore();
+
+                return $result;
             }
 
             /** We will to continue with review the threads */

diff --git a/workflow/engine/methods/login/version-pmos.php b/workflow/engine/methods/login/version-pmos.php
@@ -1,5 +1,5 @@
 <?php
 if (!defined('PM_VERSION')) {
-   define("PM_VERSION", "3.3.0-community-RE-2.5");
-   define("PM_BUILD_VERSION", "3.3.0-community-RE-2.5");
+   define("PM_VERSION", "3.3.0-community-RE-2.8");
+   define("PM_BUILD_VERSION", "3.3.0-community-RE-2.8");
 }
diff --git a/workflow/engine/methods/services/pmos2.wsdl b/workflow/engine/methods/services/pmos2.wsdl
@@ -41,6 +41,7 @@
           <xs:element name="guid" type="xs:string"/>
           <xs:element name="name" type="xs:string"/>
           <xs:element name="project_type" type="xs:string"/>
+          <xs:element name="category_guid" type="xs:string"/>
         </xs:sequence>
       </xs:complexType>
       <xs:element name="processListResponse">
@@ -800,8 +801,8 @@
           <xs:sequence>
             <xs:element name="sessionId" type="xs:string"/>
             <xs:element name="caseUid" type="xs:string"/>
-            <xs:element name="delIndex" type="xs:string"/>
-            <xs:element name="userUid" type="xs:string"/>
+            <xs:element name="delIndex" type="xs:string" nillable="true"/>
+            <xs:element name="userUid" type="xs:string" nillable="true"/>
           </xs:sequence>
         </xs:complexType>
       </xs:element>

diff --git a/workflow/engine/methods/setup/webServicesAjax.php b/workflow/engine/methods/setup/webServicesAjax.php
@@ -199,7 +199,7 @@
                 $result = G::PMWSCompositeResponse( $wsResponse, 'processes' );
 
                 $G_PUBLISH = new Publisher();
-                $rows[] = array ('guid' => 'char','name' => 'char'
+                $rows[] = array ('guid' => 'char', 'name' => 'char', 'project_type' => 'char', 'category_guid' => 'char'
                 );
 
                 if (is_array( $result )) {
@@ -212,6 +212,12 @@
                                 if ($val->key == 'name') {
                                     $name = $val->value;
                                 }
+                                if ($val->key == 'project_type') {
+                                    $project_type = $val->value;
+                                }
+                                if ($val->key == 'category_guid') {
+                                    $category = $val->value;
+                                }
                             }
                         } elseif (is_array( $item )) {
                             foreach ($item as $index => $val) {
@@ -221,6 +227,12 @@
                                 if ($val->key == 'name') {
                                     $name = $val->value;
                                 }
+                                if ($val->key == 'project_type') {
+                                    $project_type = $val->value;
+                                }
+                                if ($val->key == 'category_guid') {
+                                    $category = $val->value;
+                                }
                             }
                         } else {
                             if (isset( $item->guid )) {
@@ -229,9 +241,15 @@
                             if (isset( $item->name )) {
                                 $name = $item->name;
                             }
+                            if (isset( $item->project_type )) {
+                                $project_type = $item->project_type;
+                            }
+                            if (isset( $item->category_guid)) {
+                                $category = $item->category_guid;
+                            }
                         }
 
-                        $rows[] = array ('guid' => $guid,'name' => $name
+                        $rows[] = array ('guid' => $guid, 'name' => $name, 'project_type' => $project_type, 'category_guid'=> $category
                         );
                     }
                     global $_DBArray;

diff --git a/workflow/public_html/glpi/api/vendor/glpi-project/php-library-glpi/.gitignore b/workflow/public_html/glpi/api/vendor/glpi-project/php-library-glpi/.gitignore
@@ -1,35 +1,35 @@
-### macOS template
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-### JetBrains template
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff:
-.idea/
-
-### Composer template
-composer.phar
-/vendor/
-
-# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
-# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
-composer.lock
+### macOS template
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/
+
+### Composer template
+composer.phar
+/vendor/
+
+# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+composer.lock
diff --git a/...ow/public_html/glpi/api/vendor/glpi-project/php-library-glpi/CODE_OF_CONDUCT.md b/...ow/public_html/glpi/api/vendor/glpi-project/php-library-glpi/CODE_OF_CONDUCT.md
@@ -1,11 +1,11 @@
-# Code of Conduct
-
-As contributors and maintainers of the GLPI projects, we pledge to respect everyone who contributes by posting issues, updating documentation, submitting pull requests, providing feedback in comments, and any other activities.
-
-Communication through any of our channels (GitHub, Telegram, mailing lists, Google+, Twitter, etc.) must be constructive and never resort to personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
-
-We promise to extend courtesy and respect to everyone involved in this project regardless of gender, gender identity, sexual orientation, disability, age, race, ethnicity, religion, or level of experience. We expect anyone contributing to the GLPI projects to do the same.
-
-If any member of the community violates this code of conduct, the maintainers of the GLPI projects may take action, removing issues, comments, and PRs or blocking accounts as deemed appropriate.
-
-If you are subject to or witness unacceptable behavior, or have any other concerns, please email us at [email protected]
+# Code of Conduct
+
+As contributors and maintainers of the GLPI projects, we pledge to respect everyone who contributes by posting issues, updating documentation, submitting pull requests, providing feedback in comments, and any other activities.
+
+Communication through any of our channels (GitHub, Telegram, mailing lists, Google+, Twitter, etc.) must be constructive and never resort to personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+We promise to extend courtesy and respect to everyone involved in this project regardless of gender, gender identity, sexual orientation, disability, age, race, ethnicity, religion, or level of experience. We expect anyone contributing to the GLPI projects to do the same.
+
+If any member of the community violates this code of conduct, the maintainers of the GLPI projects may take action, removing issues, comments, and PRs or blocking accounts as deemed appropriate.
+
+If you are subject to or witness unacceptable behavior, or have any other concerns, please email us at [email protected]