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

PHRAS-3922 show the button stop on phraseanet service pull process and feedback reminder #4397

Merged
merged 1 commit into from
Oct 30, 2023
Merged

PHRAS-3922 show the button stop on phraseanet service pull process and feedback reminder #4397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/Alchemy/Phrasea/PhraseanetService/Controller/PSAdminController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public function uploaderAction(PhraseaApplication $app, Request $request)

// guess if the q is "running" = check if there are pending message on Q or loop-Q
$running = false;
$qStatuses = $this->getAMQPConnection()->getQueuesStatus();
$qStatuses = $this->getAMQPConnection()->getQueuesStatus(false, false);
foreach([
MessagePublisher::PULL_ASSETS_TYPE,
$this->getAMQPConnection()->getLoopQueueName(MessagePublisher::PULL_ASSETS_TYPE)
Expand Down
8 changes: 4 additions & 4 deletions lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ public function validationReminderAction(PhraseaApplication $app, Request $reque

// guess if the q is "running" = check if there are pending message on Q or loop-Q
$running = false;
$qStatuses = $this->getAMQPConnection()->getQueuesStatus();
$qStatuses = $this->getAMQPConnection()->getQueuesStatus(false, false);
foreach([
MessagePublisher::VALIDATION_REMINDER_TYPE,
$this->getAMQPConnection()->getLoopQueueName(MessagePublisher::VALIDATION_REMINDER_TYPE)
Expand Down Expand Up @@ -493,7 +493,7 @@ public function recordsActionsAction(PhraseaApplication $app, Request $request)

// guess if the q is "running" = check if there are pending message on Q or loop-Q
$running = false;
$qStatuses = $this->getAMQPConnection()->getQueuesStatus();
$qStatuses = $this->getAMQPConnection()->getQueuesStatus(false, false);
foreach([
MessagePublisher::RECORDS_ACTIONS_TYPE,
$this->getAMQPConnection()->getLoopQueueName(MessagePublisher::RECORDS_ACTIONS_TYPE)
Expand Down Expand Up @@ -600,7 +600,7 @@ private function getDefaultRecordsActionsSettings()
</if>
<then>
<compute_date direction="after" field="#credate" delta="+1 month" computed="exp" />
<set_field field="ExpireDate" value="$exp" />
<set_field field="ExpireDate" value="" />
<coll id="Public" />
</then>
</task>
Expand All @@ -614,7 +614,7 @@ private function getDefaultRecordsActionsSettings()
</if>
<then>
<compute_date direction="after" field="#credate" delta="+10 days" computed="exp" />
<set_field field="ExpireDate" value="$exp" />
<set_field field="ExpireDate" value="" />
<coll id="Public" />
</then>
</task>
Expand Down