Skip to content
Snippets Groups Projects
Commit a07345fb authored by Vinciane's avatar Vinciane
Browse files

FEAT #9349 change return get and adapte update

parent d3e6ae22
No related branches found
No related tags found
No related merge requests found
...@@ -101,20 +101,20 @@ class ListInstanceController ...@@ -101,20 +101,20 @@ class ListInstanceController
$listinstances[] = ['resId' => $res_id, "listinstances" => $array]; $listinstances[] = ['resId' => $res_id, "listinstances" => $array];
} }
return $response->withJson(['listinstances' => $listinstances]); return $response->withJson($listinstances);
} }
public function update(Request $request, Response $response) public function update(Request $request, Response $response)
{ {
$data = $request->getParams(); $data = $request->getParams();
if (empty($data['listinstances'])) { if (empty($data)) {
return $response->withStatus(400)->withJson(['errors' => 'listinstances is missing or is empty']); return $response->withStatus(400)->withJson(['errors' => 'listinstances is missing or is empty']);
} }
DatabaseModel::beginTransaction(); DatabaseModel::beginTransaction();
foreach ($data['listinstances'] as $ListInstanceByRes) { foreach ($data as $ListInstanceByRes) {
if (empty($ListInstanceByRes['resId'])) { if (empty($ListInstanceByRes['resId'])) {
DatabaseModel::rollbackTransaction(); DatabaseModel::rollbackTransaction();
return $response->withStatus(400)->withJson(['errors' => 'resId is empty']); return $response->withStatus(400)->withJson(['errors' => 'resId is empty']);
......
...@@ -230,7 +230,7 @@ export class UsersAdministrationComponent extends AutoCompletePlugin implements ...@@ -230,7 +230,7 @@ export class UsersAdministrationComponent extends AutoCompletePlugin implements
//update listInstances //update listInstances
this.updateListInstance = false; this.updateListInstance = false;
this.http.put(this.coreUrl + 'rest/listinstances', user) this.http.put(this.coreUrl + 'rest/listinstances', user.listinstances)
.subscribe((data: any) => { .subscribe((data: any) => {
if (data.errors) { if (data.errors) {
this.notify.error(data.errors); this.notify.error(data.errors);
...@@ -273,7 +273,6 @@ export class UsersAdministrationComponent extends AutoCompletePlugin implements ...@@ -273,7 +273,6 @@ export class UsersAdministrationComponent extends AutoCompletePlugin implements
//user inDiffListDest //user inDiffListDest
} else if (user.inDiffListDest && !user.isResDestUser) { } else if (user.inDiffListDest && !user.isResDestUser) {
//update listModels //update listModels
this.updateListModel = false; this.updateListModel = false;
this.http.put(this.coreUrl + 'rest/listTemplates/entityDest/itemId/' + user.user_id, user) this.http.put(this.coreUrl + 'rest/listTemplates/entityDest/itemId/' + user.user_id, user)
...@@ -314,9 +313,8 @@ export class UsersAdministrationComponent extends AutoCompletePlugin implements ...@@ -314,9 +313,8 @@ export class UsersAdministrationComponent extends AutoCompletePlugin implements
//user isResDestUser //user isResDestUser
} else if (!user.inDiffListDest && user.isResDestUser) { } else if (!user.inDiffListDest && user.isResDestUser) {
//update listInstances //update listInstances
this.http.put(this.coreUrl + 'rest/listinstances', user) this.http.put(this.coreUrl + 'rest/listinstances', user.listinstances)
.subscribe((data: any) => { .subscribe((data: any) => {
if (data.errors) { if (data.errors) {
this.notify.error(data.errors); this.notify.error(data.errors);
...@@ -417,10 +415,11 @@ export class UsersAdministrationRedirectModalComponent extends AutoCompletePlugi ...@@ -417,10 +415,11 @@ export class UsersAdministrationRedirectModalComponent extends AutoCompletePlugi
this.loadInstance = true; this.loadInstance = true;
this.http.get(this.coreUrl + 'rest/listinstances/dest/itemId/' + this.data.userDestRedirect.user_id) this.http.get(this.coreUrl + 'rest/listinstances/dest/itemId/' + this.data.userDestRedirect.user_id)
.subscribe((dataInstance: any) => { .subscribe((dataInstance: any) => {
this.data.listinstances = dataInstance.listinstances; this.data.listinstances = dataInstance;
this.loadInstance = false; this.loadInstance = false;
}); });
} }
} }
sendFunction() { sendFunction() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment