Merge branch 'main' into prevent-invalid-year-input

Author: bahman026

l10n/be.js

@@ -24,7 +24,7 @@ OC.L10N.register(
     "Keep existing file" : "Пакінуць існуючы файл",
     "Add list" : "Дадаць спіс",
     "Active filters" : "Актыўныя фільтры",
-    "Apply filter" : "Ужыць фільтр",
+    "Apply filter" : "Прымяніць фільтр",
     "Open" : "Адкрыць",
     "Clear filter" : "Ачысціць фільтр",
     "Open details" : "Адкрыць падрабязнасці",

l10n/be.json

@@ -22,7 +22,7 @@
     "Keep existing file" : "Пакінуць існуючы файл",
     "Add list" : "Дадаць спіс",
     "Active filters" : "Актыўныя фільтры",
-    "Apply filter" : "Ужыць фільтр",
+    "Apply filter" : "Прымяніць фільтр",
     "Open" : "Адкрыць",
     "Clear filter" : "Ачысціць фільтр",
     "Open details" : "Адкрыць падрабязнасці",

l10n/hr.js

@@ -59,6 +59,7 @@ OC.L10N.register(
     "seconds ago" : "seconds ago",
     "Archived boards" : "Arxivlangan taxtalar",
     "Shared with you" : "Shared with you",
+    "Cancel edit" : "Tahrirni bekor qilish",
     "No reminder" : "Eslatma yo'q",
     "Edit board" : "Tahrirlash paneli",
     "Clone board" : "Klon taxtasi",

l10n/hr.json

@@ -57,6 +57,7 @@
     "seconds ago" : "seconds ago",
     "Archived boards" : "Arxivlangan taxtalar",
     "Shared with you" : "Shared with you",
+    "Cancel edit" : "Tahrirni bekor qilish",
     "No reminder" : "Eslatma yo'q",
     "Edit board" : "Tahrirlash paneli",
     "Clone board" : "Klon taxtasi",

l10n/uz.js

@@ -9,6 +9,7 @@
 
 use OCA\Deck\Db\Acl;
 use OCA\Deck\Service\CardService;
+use OCA\Deck\Service\CirclesService;
 use OCP\Activity\IEvent;
 use OCP\Activity\IProvider;
 use OCP\Comments\IComment;
@@ -38,7 +39,10 @@ class DeckProvider implements IProvider {
 	/** @var CardService */
 	private $cardService;
 
-	public function __construct(IURLGenerator $urlGenerator, ActivityManager $activityManager, IUserManager $userManager, ICommentsManager $commentsManager, IFactory $l10n, IConfig $config, $userId, CardService $cardService) {
+	/** @var CirclesService */
+	private $circlesService;
+
+	public function __construct(IURLGenerator $urlGenerator, ActivityManager $activityManager, IUserManager $userManager, ICommentsManager $commentsManager, IFactory $l10n, IConfig $config, $userId, CardService $cardService, CirclesService $circlesService) {
 		$this->userId = $userId;
 		$this->urlGenerator = $urlGenerator;
 		$this->activityManager = $activityManager;
@@ -47,6 +51,7 @@ public function __construct(IURLGenerator $urlGenerator, ActivityManager $activi
 		$this->l10nFactory = $l10n;
 		$this->config = $config;
 		$this->cardService = $cardService;
+		$this->circlesService = $circlesService;
 	}
 
 	/**
@@ -275,6 +280,17 @@ private function parseParamForAcl($subjectParams, $params) {
 					'id' => $subjectParams['acl']['participant'],
 					'name' => $user !== null ? $user->getDisplayName() : $subjectParams['acl']['participant']
 				];
+			} elseif ($subjectParams['acl']['type'] === Acl::PERMISSION_TYPE_CIRCLE) {
+				$circle = $this->circlesService->getCircle($subjectParams['acl']['participant']);
+
+				// suppressing psalm because $circle is typed as Circle|null but psalm doesnt know about the OCA class
+				// $circle->getName() will be defined when $circle is not null
+				/** @psalm-suppress UndefinedMethod */
+				$params['acl'] = [
+					'type' => 'highlight',
+					'id' => $subjectParams['acl']['participant'],
+					'name' => $circle ? $circle->getName() : $subjectParams['acl']['participant']
+				];
 			} else {
 				$params['acl'] = [
 					'type' => 'highlight',

l10n/uz.json

@@ -751,14 +751,39 @@ private function _getSharedWith(
 			}
 
 			if ($path !== null) {
-				$qb->leftJoin('s', 'share', 'sc', $qb->expr()->eq('s.parent', 'sc.id'))
-					->andWhere($qb->expr()->eq('sc.share_type', $qb->createNamedParameter(IShare::TYPE_DECK_USER)))
-					->andWhere($qb->expr()->eq('sc.share_with', $qb->createNamedParameter($userId)));
+				$path = str_replace('/' . $userId . '/files', '', $path);
+				$path = rtrim($path, '/');
+
+				$onClause = $qb->expr()->andX(
+					$qb->expr()->eq('sc.parent', 's.id'),
+					$qb->expr()->eq('sc.share_type', $qb->createNamedParameter(IShare::TYPE_DECK_USER)),
+					$qb->expr()->eq('sc.share_with', $qb->createNamedParameter($userId)),
+				);
+				$qb->leftJoin('s', 'share', 'sc', $onClause);
 
 				if ($forChildren) {
-					$qb->andWhere($qb->expr()->like('sc.file_target', $qb->createNamedParameter($this->dbConnection->escapeLikeParameter($path) . '_%')));
+					$childPathTemplate = $this->dbConnection->escapeLikeParameter($path) . '/_%';
+
+					$qb->andWhere(
+						$qb->expr()->orX(
+							$qb->expr()->like('sc.file_target', $qb->createNamedParameter($childPathTemplate, IQueryBuilder::PARAM_STR)),
+							$qb->expr()->andX(
+								$qb->expr()->isNull('sc.file_target'),
+								$qb->expr()->like('s.file_target', $qb->createNamedParameter($childPathTemplate, IQueryBuilder::PARAM_STR)),
+							),
+						),
+					);
 				} else {
-					$qb->andWhere($qb->expr()->eq('sc.file_target', $qb->createNamedParameter($path)));
+					$nonChildPath = $path === '' ? '/' : $path;
+					$qb->andWhere(
+						$qb->expr()->orX(
+							$qb->expr()->eq('sc.file_target', $qb->createNamedParameter($nonChildPath, IQueryBuilder::PARAM_STR)),
+							$qb->expr()->andX(
+								$qb->expr()->isNull('sc.file_target'),
+								$qb->expr()->eq('s.file_target', $qb->createNamedParameter($nonChildPath, IQueryBuilder::PARAM_STR)),
+							),
+						),
+					);
 				}
 			}