Skip to content

FOUR-15854 on task completed - override behavior #6875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rodriquelca merged 5 commits into from
May 28, 2024
Merged

FOUR-15854 on task completed - override behavior #6875

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6385995
feat: add element destination attribute to process request token mode…
devmiguelangel May 24, 2024
b438c67
fix(sq): fix code smell
devmiguelangel May 24, 2024
478ca10
feat: add element destination for custom dashboard and external url b…
devmiguelangel May 24, 2024
105c797
fix(cr): improve code
devmiguelangel May 27, 2024
996ae52
add translation labels
rodriquelca May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(cr): improve code
  • Loading branch information
@devmiguelangel
devmiguelangel committed May 27, 2024
commit 105c79724cde093d191a07d7e291b11b659a2440
61 changes: 43 additions & 18 deletions ProcessMaker/Models/ProcessRequestToken.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,13 +288,31 @@ public function assignableUsers()
return new TokenAssignableUsers($query, $this);
}

/**
* Returns either the owner element or its properties
*
* @param asObject Boolean flag that determines whether the function should return the element directly or its
* properties as an object.
*
* @return If the parameter is true, the function will return the object. If is false, the
* function will return the properties of the object.
*/
private function getDefinitionFromOwner($asObject)
Comment thread
devmiguelangel marked this conversation as resolved.
Resolved
{
$element = $this->getOwnerElement();

return $asObject ? $element : $element->getProperties();
}

/**
* Retrieves a specific element's BPMN definition from a request object and returns either the element
* itself or its properties.
*
* @param asObject Boolean flag that determines whether the function should return the BPMN element instance
* as an object or just its properties.
*
* @return If `asObject` is false, the properties of the BPMN element instance are returned.
*/
private function getDefinitionFromRequest($asObject)
Comment thread
devmiguelangel marked this conversation as resolved.
Resolved
{
$request = $this->processRequest ?: $this->getInstance();
Expand Down Expand Up @@ -1172,26 +1190,9 @@ public function reassign($toUserId, User $requestingUser)
event(new ActivityAssigned($this));
}

/**
* Determines the destination URL based on the element destination type specified in the definition.
*
* @return string|null
*/
public function getElementDestinationAttribute(): ?string
private function getElementDestination($elementDestinationType, $elementDestinationProp)
{
$definition = $this->getDefinition();
$elementDestinationProp = $definition['elementDestination'] ?? null;
$elementDestination = null;
$elementDestinationType = null;

try {
$elementDestinationProp = json_decode($elementDestinationProp, true);
if (is_array($elementDestinationProp) && array_key_exists('type', $elementDestinationProp)) {
$elementDestinationType = $elementDestinationProp['type'];
}
} catch (Exception $e) {
return null;
}

switch ($elementDestinationType) {
Comment thread
devmiguelangel marked this conversation as resolved.
Resolved
case 'customDashboard':
Expand Down Expand Up @@ -1227,8 +1228,32 @@ public function getElementDestinationAttribute(): ?string
default:
$elementDestination = null;
break;

}

return $elementDestination;
}

/**
* Determines the destination URL based on the element destination type specified in the definition.
*
* @return string|null
*/
public function getElementDestinationAttribute(): ?string
{
$definition = $this->getDefinition();
$elementDestinationProp = $definition['elementDestination'] ?? null;
$elementDestinationType = null;

try {
$elementDestinationProp = json_decode($elementDestinationProp, true);
if (is_array($elementDestinationProp) && array_key_exists('type', $elementDestinationProp)) {
$elementDestinationType = $elementDestinationProp['type'];
}
} catch (Exception $e) {
return null;
}

return $this->getElementDestination($elementDestinationType, $elementDestinationProp);
}
}