Skip to content
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

DDLS-74: CSV upload pages missing status #1477

Merged
merged 2 commits into from
Dec 4, 2023
Merged

DDLS-74: CSV upload pages missing status #1477

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e331c1c
Update retrieving of redis keys to include workspace variable
Gugandeep Nov 30, 2023
36488cd
Merge branch 'main' into DDLS-74
Gugandeep Dec 4, 2023
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
8 changes: 4 additions & 4 deletions client/app/src/Controller/Admin/IndexController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,8 +470,8 @@ public function uploadUsersAction(Request $request, ClientInterface $redisClient
$this->addFlash('error', 'There was a problem locating the file inside the S3 Bucket. Please contact an administrator.');
}

$processStatus = $redisClient->get('lay-csv-processing');
$processCompletedDate = $redisClient->get('lay-csv-completed-date');
$processStatus = $redisClient->get($this->workspace.'-lay-csv-processing');
$processCompletedDate = $redisClient->get($this->workspace.'-lay-csv-completed-date');

return [
'nOfChunks' => $request->get('nOfChunks'),
Expand Down Expand Up @@ -575,8 +575,8 @@ public function uploadOrgUsersAction(Request $request, ClientInterface $redisCli
$this->addFlash('error', 'There was a problem locating the file inside the S3 Bucket. Please contact an administrator.');
}

$processStatus = $redisClient->get('org-csv-processing');
$processCompletedDate = $redisClient->get('org-csv-completed-date');
$processStatus = $redisClient->get($this->workspace.'-org-csv-processing');
$processCompletedDate = $redisClient->get($this->workspace.'-org-csv-completed-date');

return [
'form' => $form->createView(),
Expand Down
Loading