diff --git a/config/autoload/local.php.dist b/config/autoload/local.php.dist index 07bd3f3..fcfaef7 100644 --- a/config/autoload/local.php.dist +++ b/config/autoload/local.php.dist @@ -26,7 +26,8 @@ return [ 'pass' => 'password', 'server-url' => 'api-factory-server-url', 'public-url' => 'api-factory-web-url', - 'access-requests' => 'access_requests_dataset' + 'access-requests' => 'access_requests_dataset', + 'dataset-metadata' => 'metadata_dataset' ], 'mkdf-file' => [ 'destination' => 'data/', diff --git a/module/mkdf-policies/data/exampleNogotiationWorkflow.json b/module/mkdf-policies/data/exampleNogotiationWorkflow.json deleted file mode 100644 index 6c93e7c..0000000 --- a/module/mkdf-policies/data/exampleNogotiationWorkflow.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "_id": "12345", - "@type": "NegotiationWorkflow", - "dataset": "783647-3423-345-gfh-546", - "requestUser": "dataset-user-email", - "licenseScope": "dataset|document|file", - "resourceId": "null|filename.jpg|json_doc_id", - "created": "", - "modified": "", - "status": "REQUESTED|APPROVED|REJECTED|COUNTER", - "history": [ - { - "type": "request", - "timestamp": "", - "comment": "Comments and messages associated with the request", - "policiesAdded": [], - "policiesRemoved": [] - }, - { - "type": "response", - "timestamp": "", - "user": "(dataset owner/manager)", - "comment": "Comments and messages associated with the response", - "responseStatus": "APPROVED|REJECTED|COUNTER", - "counterOffer": [] - } - ], - "finalLicense": {...} -} \ No newline at end of file diff --git a/module/mkdf-policies/view/mkdf/policies/policy/apply.phtml b/module/mkdf-policies/view/mkdf/policies/policy/apply.phtml deleted file mode 100644 index 10d188b..0000000 --- a/module/mkdf-policies/view/mkdf/policies/policy/apply.phtml +++ /dev/null @@ -1,41 +0,0 @@ -

Apply license

-partial('mkdf/core/partial/messages', ['messages' => $messages] ) ?> - -

- Are you sure you wish to apply this license?
- - - -
-

-partial('mkdf/core/partial/actions', [ - 'buttons'=>[ - [ - 'type'=>'primary', - 'label'=>'Yes, apply this license', - 'target'=> 'dataset-policies', - 'params'=> - [ - 'id' => $dataset->id, - 'action' => 'apply' - ], - 'query' => - [ - 'license' => $license, - 'licenseScope' => $licenseScope, - 'jsondoc' => $jsonDoc, - 'filename' => $filename, - 'userScope' => $userScope, - 'assigneeEmail' => $assigneeEmail, - 'custom' => $custom, - 'validFrom' => $validFrom, - 'validUntil' => $validUntil, - 'token' => $token - ] - ], - ['type'=>'danger','label'=>'No, go back please', 'target'=> 'dataset-policies', 'params'=> ['id' => $dataset->id, 'action' => 'index']]] -] ); ?>