diff options
Diffstat (limited to 'apps/workflowengine')
| -rw-r--r-- | apps/workflowengine/l10n/uk.js | 3 | ||||
| -rw-r--r-- | apps/workflowengine/l10n/uk.json | 3 | ||||
| -rw-r--r-- | apps/workflowengine/lib/Controller/AWorkflowController.php | 4 | ||||
| -rw-r--r-- | apps/workflowengine/lib/Controller/UserWorkflowsController.php | 4 | ||||
| -rw-r--r-- | apps/workflowengine/lib/Entity/File.php | 6 | ||||
| -rw-r--r-- | apps/workflowengine/lib/Manager.php | 2 | ||||
| -rw-r--r-- | apps/workflowengine/src/store.js | 7 |
7 files changed, 21 insertions, 8 deletions
diff --git a/apps/workflowengine/l10n/uk.js b/apps/workflowengine/l10n/uk.js index c162b602e2e..6e561713e11 100644 --- a/apps/workflowengine/l10n/uk.js +++ b/apps/workflowengine/l10n/uk.js @@ -80,12 +80,15 @@ OC.L10N.register( "Save" : "Зберегти", "Available flows" : "Процеси", "For details on how to write your own flow, check out the development documentation." : "Перегляньте документацію для розробника, щоби дізнатися, як додати власні процеси.", + "No flows installed" : "Відсутні процеси", + "Ask your administrator to install new flows." : "Зверніться до адміністратора щодо встановлення нових процесів.", "More flows" : "Більше процесів", "Browse the App Store" : "Перейти до App Store", "Show less" : "Показувати менше", "Show more" : "Показати більше", "Configured flows" : "Налаштовані процеси", "Your flows" : "Ваші процеси", + "No flows configured" : "Процеси не налаштовано", "matches" : "містить", "does not match" : "не містить", "is" : "є", diff --git a/apps/workflowengine/l10n/uk.json b/apps/workflowengine/l10n/uk.json index 5d5783e651c..a24a3785deb 100644 --- a/apps/workflowengine/l10n/uk.json +++ b/apps/workflowengine/l10n/uk.json @@ -78,12 +78,15 @@ "Save" : "Зберегти", "Available flows" : "Процеси", "For details on how to write your own flow, check out the development documentation." : "Перегляньте документацію для розробника, щоби дізнатися, як додати власні процеси.", + "No flows installed" : "Відсутні процеси", + "Ask your administrator to install new flows." : "Зверніться до адміністратора щодо встановлення нових процесів.", "More flows" : "Більше процесів", "Browse the App Store" : "Перейти до App Store", "Show less" : "Показувати менше", "Show more" : "Показати більше", "Configured flows" : "Налаштовані процеси", "Your flows" : "Ваші процеси", + "No flows configured" : "Процеси не налаштовано", "matches" : "містить", "does not match" : "не містить", "is" : "є", diff --git a/apps/workflowengine/lib/Controller/AWorkflowController.php b/apps/workflowengine/lib/Controller/AWorkflowController.php index 77e50526092..2c3655743ff 100644 --- a/apps/workflowengine/lib/Controller/AWorkflowController.php +++ b/apps/workflowengine/lib/Controller/AWorkflowController.php @@ -30,6 +30,7 @@ namespace OCA\WorkflowEngine\Controller; use Doctrine\DBAL\Exception; use OCA\WorkflowEngine\Helper\ScopeContext; use OCA\WorkflowEngine\Manager; +use OCP\AppFramework\Http\Attribute\PasswordConfirmationRequired; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\OCS\OCSBadRequestException; use OCP\AppFramework\OCS\OCSException; @@ -103,6 +104,7 @@ abstract class AWorkflowController extends OCSController { * @throws OCSForbiddenException * @throws OCSException */ + #[PasswordConfirmationRequired] public function create( string $class, string $name, @@ -131,6 +133,7 @@ abstract class AWorkflowController extends OCSController { * @throws OCSForbiddenException * @throws OCSException */ + #[PasswordConfirmationRequired] public function update( int $id, string $name, @@ -159,6 +162,7 @@ abstract class AWorkflowController extends OCSController { * @throws OCSForbiddenException * @throws OCSException */ + #[PasswordConfirmationRequired] public function destroy(int $id): DataResponse { try { $deleted = $this->manager->deleteOperation($id, $this->getScopeContext()); diff --git a/apps/workflowengine/lib/Controller/UserWorkflowsController.php b/apps/workflowengine/lib/Controller/UserWorkflowsController.php index dd2457dd9e8..02c52deb9c7 100644 --- a/apps/workflowengine/lib/Controller/UserWorkflowsController.php +++ b/apps/workflowengine/lib/Controller/UserWorkflowsController.php @@ -29,6 +29,7 @@ namespace OCA\WorkflowEngine\Controller; use OCA\WorkflowEngine\Helper\ScopeContext; use OCA\WorkflowEngine\Manager; +use OCP\AppFramework\Http\Attribute\PasswordConfirmationRequired; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\OCS\OCSBadRequestException; use OCP\AppFramework\OCS\OCSForbiddenException; @@ -84,6 +85,7 @@ class UserWorkflowsController extends AWorkflowController { * @throws OCSBadRequestException * @throws OCSForbiddenException */ + #[PasswordConfirmationRequired] public function create(string $class, string $name, array $checks, string $operation, string $entity, array $events): DataResponse { return parent::create($class, $name, $checks, $operation, $entity, $events); } @@ -93,6 +95,7 @@ class UserWorkflowsController extends AWorkflowController { * @throws OCSBadRequestException * @throws OCSForbiddenException */ + #[PasswordConfirmationRequired] public function update(int $id, string $name, array $checks, string $operation, string $entity, array $events): DataResponse { return parent::update($id, $name, $checks, $operation, $entity, $events); } @@ -101,6 +104,7 @@ class UserWorkflowsController extends AWorkflowController { * @NoAdminRequired * @throws OCSForbiddenException */ + #[PasswordConfirmationRequired] public function destroy(int $id): DataResponse { return parent::destroy($id); } diff --git a/apps/workflowengine/lib/Entity/File.php b/apps/workflowengine/lib/Entity/File.php index 7caaaf0e225..5b9c4892f92 100644 --- a/apps/workflowengine/lib/Entity/File.php +++ b/apps/workflowengine/lib/Entity/File.php @@ -140,10 +140,10 @@ class File implements IEntity, IDisplayText, IUrl, IIcon, IContextPortation { } } - public function isLegitimatedForUserId(string $uid): bool { + public function isLegitimatedForUserId(string $userId): bool { try { $node = $this->getNode(); - if ($node->getOwner()->getUID() === $uid) { + if ($node->getOwner()?->getUID() === $userId) { return true; } @@ -154,7 +154,7 @@ class File implements IEntity, IDisplayText, IUrl, IIcon, IContextPortation { $fileId = $node->getId(); } - $mountInfos = $this->userMountCache->getMountsForFileId($fileId, $uid); + $mountInfos = $this->userMountCache->getMountsForFileId($fileId, $userId); foreach ($mountInfos as $mountInfo) { $mount = $this->mountManager->getMountFromMountInfo($mountInfo); if ($mount && $mount->getStorage() && !empty($mount->getStorage()->getCache()->get($fileId))) { diff --git a/apps/workflowengine/lib/Manager.php b/apps/workflowengine/lib/Manager.php index 674cfc65313..24e3c216e48 100644 --- a/apps/workflowengine/lib/Manager.php +++ b/apps/workflowengine/lib/Manager.php @@ -380,7 +380,7 @@ class Manager implements IManager { ->where($qb->expr()->eq('s.type', $qb->createParameter('scope'))); if ($scopeContext->getScope() !== IManager::SCOPE_ADMIN) { - $qb->where($qb->expr()->eq('s.value', $qb->createParameter('scopeId'))); + $qb->andWhere($qb->expr()->eq('s.value', $qb->createParameter('scopeId'))); } $qb->setParameters(['scope' => $scopeContext->getScope(), 'scopeId' => $scopeContext->getScopeId()]); diff --git a/apps/workflowengine/src/store.js b/apps/workflowengine/src/store.js index 49c881e67b6..6f8905687cf 100644 --- a/apps/workflowengine/src/store.js +++ b/apps/workflowengine/src/store.js @@ -89,7 +89,8 @@ const store = new Store({ context.commit('addRule', rule) }) }, - createNewRule(context, rule) { + async createNewRule(context, rule) { + await confirmPassword() let entity = null let events = [] if (rule.isComplex === false && rule.fixedEntity === '') { @@ -120,9 +121,7 @@ const store = new Store({ context.commit('removeRule', rule) }, async pushUpdateRule(context, rule) { - if (context.state.scope === 0) { - await confirmPassword() - } + await confirmPassword() let result if (rule.id < 0) { result = await axios.post(getApiUrl(''), rule) |