Skip to content

Commit 3101cc2

Browse files
tomolimotomolimo
committed
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
1 parent 6f8e4d6 commit 3101cc2

File tree

18 files changed

+1307
-1278
lines changed

18 files changed

+1307
-1278
lines changed

‎workflow/engine/classes/WsBase.php

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,16 +131,19 @@ public function processList()
131131
$result[] = array(
132132
'guid' => $aRow['PRO_UID'],
133133
'name' => $arrayProcess['PRO_TITLE'],
134-
'project_type' => in_array($aRow['PRO_UID'], $bpmnProjects) ? 'bpmn' : 'classic'
134+
'project_type' => in_array($aRow['PRO_UID'], $bpmnProjects) ? 'bpmn' : 'classic',
135+
'category_guid' => $aRow['PRO_CATEGORY']
135136
);
136137
$oDataset->next();
137138
}
138139

139140
return $result;
140141
} catch (Exception $e) {
141142
$result[] = array(
142-
'guid' => $e->getMessage(),
143-
'name' => $e->getMessage()
143+
'guid' => $e->getMessage(),
144+
'name' => $e->getMessage(),
145+
'project_type' => '',
146+
'category_guid' => ''
144147
);
145148

146149
return $result;
@@ -3098,6 +3101,13 @@ public function cancelCase($caseUid, $delIndex, $userUid)
30983101
/** If those parameters are null we will to force the cancelCase */
30993102
if (is_null($delIndex) && is_null($userUid)) {
31003103
/*----------------------------------********---------------------------------*/
3104+
$case->cancelCase($caseUid);
3105+
3106+
//Define the result of the cancelCase
3107+
$result = self::messageExecuteSuccessfully();
3108+
$g->sessionVarRestore();
3109+
3110+
return $result;
31013111
}
31023112

31033113
/** We will to continue with review the threads */

‎workflow/engine/methods/login/version-pmos.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
22
if (!defined('PM_VERSION')) {
3-
define("PM_VERSION", "3.3.0-community-RE-2.5");
4-
define("PM_BUILD_VERSION", "3.3.0-community-RE-2.5");
3+
define("PM_VERSION", "3.3.0-community-RE-2.8");
4+
define("PM_BUILD_VERSION", "3.3.0-community-RE-2.8");
55
}

‎workflow/engine/methods/services/pmos2.wsdl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<xs:element name="guid" type="xs:string"/>
4242
<xs:element name="name" type="xs:string"/>
4343
<xs:element name="project_type" type="xs:string"/>
44+
<xs:element name="category_guid" type="xs:string"/>
4445
</xs:sequence>
4546
</xs:complexType>
4647
<xs:element name="processListResponse">
@@ -800,8 +801,8 @@
800801
<xs:sequence>
801802
<xs:element name="sessionId" type="xs:string"/>
802803
<xs:element name="caseUid" type="xs:string"/>
803-
<xs:element name="delIndex" type="xs:string"/>
804-
<xs:element name="userUid" type="xs:string"/>
804+
<xs:element name="delIndex" type="xs:string" nillable="true"/>
805+
<xs:element name="userUid" type="xs:string" nillable="true"/>
805806
</xs:sequence>
806807
</xs:complexType>
807808
</xs:element>

‎workflow/engine/methods/setup/webServicesAjax.php

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@
199199
$result = G::PMWSCompositeResponse( $wsResponse, 'processes' );
200200

201201
$G_PUBLISH = new Publisher();
202-
$rows[] = array ('guid' => 'char','name' => 'char'
202+
$rows[] = array ('guid' => 'char', 'name' => 'char', 'project_type' => 'char', 'category_guid' => 'char'
203203
);
204204

205205
if (is_array( $result )) {
@@ -212,6 +212,12 @@
212212
if ($val->key == 'name') {
213213
$name = $val->value;
214214
}
215+
if ($val->key == 'project_type') {
216+
$project_type = $val->value;
217+
}
218+
if ($val->key == 'category_guid') {
219+
$category = $val->value;
220+
}
215221
}
216222
} elseif (is_array( $item )) {
217223
foreach ($item as $index => $val) {
@@ -221,6 +227,12 @@
221227
if ($val->key == 'name') {
222228
$name = $val->value;
223229
}
230+
if ($val->key == 'project_type') {
231+
$project_type = $val->value;
232+
}
233+
if ($val->key == 'category_guid') {
234+
$category = $val->value;
235+
}
224236
}
225237
} else {
226238
if (isset( $item->guid )) {
@@ -229,9 +241,15 @@
229241
if (isset( $item->name )) {
230242
$name = $item->name;
231243
}
244+
if (isset( $item->project_type )) {
245+
$project_type = $item->project_type;
246+
}
247+
if (isset( $item->category_guid)) {
248+
$category = $item->category_guid;
249+
}
232250
}
233251

234-
$rows[] = array ('guid' => $guid,'name' => $name
252+
$rows[] = array ('guid' => $guid, 'name' => $name, 'project_type' => $project_type, 'category_guid'=> $category
235253
);
236254
}
237255
global $_DBArray;

‎workflow/public_html/glpi/api/vendor/glpi-project/php-library-glpi/.gitignore

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
### macOS template
2-
# General
3-
.DS_Store
4-
.AppleDouble
5-
.LSOverride
6-
7-
# Icon must end with two \r
8-
Icon
9-
10-
# Thumbnails
11-
._*
12-
13-
# Files that might appear in the root of a volume
14-
.DocumentRevisions-V100
15-
.fseventsd
16-
.Spotlight-V100
17-
.TemporaryItems
18-
.Trashes
19-
.VolumeIcon.icns
20-
.com.apple.timemachine.donotpresent
21-
22-
### JetBrains template
23-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
24-
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
25-
26-
# User-specific stuff:
27-
.idea/
28-
29-
### Composer template
30-
composer.phar
31-
/vendor/
32-
33-
# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
34-
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
35-
composer.lock
1+
### macOS template
2+
# General
3+
.DS_Store
4+
.AppleDouble
5+
.LSOverride
6+
7+
# Icon must end with two \r
8+
Icon
9+
10+
# Thumbnails
11+
._*
12+
13+
# Files that might appear in the root of a volume
14+
.DocumentRevisions-V100
15+
.fseventsd
16+
.Spotlight-V100
17+
.TemporaryItems
18+
.Trashes
19+
.VolumeIcon.icns
20+
.com.apple.timemachine.donotpresent
21+
22+
### JetBrains template
23+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
24+
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
25+
26+
# User-specific stuff:
27+
.idea/
28+
29+
### Composer template
30+
composer.phar
31+
/vendor/
32+
33+
# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
34+
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
35+
composer.lock

‎workflow/public_html/glpi/api/vendor/glpi-project/php-library-glpi/CODE_OF_CONDUCT.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# Code of Conduct
2-
3-
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.
4-
5-
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.
6-
7-
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.
8-
9-
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.
10-
11-
If you are subject to or witness unacceptable behavior, or have any other concerns, please email us at glpi@teclib.com
1+
# Code of Conduct
2+
3+
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.
4+
5+
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.
6+
7+
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.
8+
9+
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.
10+
11+
If you are subject to or witness unacceptable behavior, or have any other concerns, please email us at glpi@teclib.com

0 commit comments

Comments
 (0)