diff options
author | Frederic Guillot <fred@kanboard.net> | 2015-02-27 19:15:23 -0500 |
---|---|---|
committer | Frederic Guillot <fred@kanboard.net> | 2015-02-27 19:15:23 -0500 |
commit | db59460da16bc607ae2e73838925bf3f6a95259d (patch) | |
tree | 0fa5fbfd43d95db1745f1a384e38931dbfa262cc /jsonrpc.php | |
parent | dd051feb8cd1d28244f701adffbe4b69ac9e161c (diff) |
Improve pull-request
Diffstat (limited to 'jsonrpc.php')
-rw-r--r-- | jsonrpc.php | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/jsonrpc.php b/jsonrpc.php index 65d4405e..a2106010 100644 --- a/jsonrpc.php +++ b/jsonrpc.php @@ -82,58 +82,70 @@ $server->bind('moveSwimlaneDown', $container['swimlane'], 'moveDown'); $server->bind('getAvailableActions', $container['action'], 'getAvailableActions'); $server->bind('getAvailableEvents', $container['action'], 'getAvailableEvents'); $server->bind('getCompatibleEvents', $container['action'], 'getCompatibleEvents'); +$server->bind('removeAction', $container['action'], 'remove'); + $server->register('getActions', function($project_id) use ($container) { $actions = $container['action']->getAllByProject($project_id); - foreach($actions as $index => $action) { + + foreach ($actions as $index => $action) { $params = array(); - foreach($action['params'] as $param) + + foreach($action['params'] as $param) { $params[$param['name']] = $param['value']; + } + $actions[$index]['params'] = $params; } + return $actions; }); + $server->register('createAction', function($project_id, $event_name, $action_name, $params) use ($container) { $values = array( 'project_id' => $project_id, 'event_name' => $event_name, 'action_name' => $action_name, - 'params' => $params + 'params' => $params, ); list($valid,) = $container['action']->validateCreation($values); + if (! $valid) { return false; } - //Check the action exists + // Check the action exists if (! isset($container['action']->getAvailableActions()[$action_name])) { return false; } - //Check the event + // Check the event $action = $container['action']->load($action_name, $project_id, $event_name); + if (! in_array($event_name, $action->getCompatibleEvents())) { return false; } $required_params = $action->getActionRequiredParameters(); - //Check missing parameters - foreach($required_params as $param => $value) + // Check missing parameters + foreach($required_params as $param => $value) { if (! isset($params[$param])) { return false; } + } - //Check extra parameters - foreach($params as $param => $value) + // Check extra parameters + foreach($params as $param => $value) { if (! isset($required_params[$param])) { return false; } + } return $container['action']->create($values); }); -$server->bind('removeAction', $container['action'], 'remove'); + /** * Project permissions procedures |