Signed-off-by: Julius Härtl <jus@bitgrid.net>tags/v21.0.0beta1
@@ -83,6 +83,7 @@ class ShareesAPIController extends OCSController { | |||
'emails' => [], | |||
'circles' => [], | |||
'rooms' => [], | |||
'deck' => [], | |||
], | |||
'users' => [], | |||
'groups' => [], | |||
@@ -92,6 +93,7 @@ class ShareesAPIController extends OCSController { | |||
'lookup' => [], | |||
'circles' => [], | |||
'rooms' => [], | |||
'deck' => [], | |||
'lookupEnabled' => false, | |||
]; | |||
@@ -183,6 +185,10 @@ class ShareesAPIController extends OCSController { | |||
if ($this->shareManager->shareProviderExists(IShare::TYPE_ROOM)) { | |||
$shareTypes[] = IShare::TYPE_ROOM; | |||
} | |||
if ($this->shareManager->shareProviderExists(IShare::TYPE_DECK)) { | |||
$shareTypes[] = IShare::TYPE_DECK; | |||
} | |||
} else { | |||
$shareTypes[] = IShare::TYPE_GROUP; | |||
$shareTypes[] = IShare::TYPE_EMAIL; | |||
@@ -193,6 +199,10 @@ class ShareesAPIController extends OCSController { | |||
$shareTypes[] = IShare::TYPE_CIRCLE; | |||
} | |||
if ($this->shareManager->shareProviderExists(IShare::TYPE_DECK)) { | |||
$shareTypes[] = IShare::TYPE_DECK; | |||
} | |||
if ($shareType !== null && is_array($shareType)) { | |||
$shareTypes = array_intersect($shareTypes, $shareType); | |||
} elseif (is_numeric($shareType)) { |
@@ -186,6 +186,7 @@ export default { | |||
this.SHARE_TYPES.SHARE_TYPE_CIRCLE, | |||
this.SHARE_TYPES.SHARE_TYPE_ROOM, | |||
this.SHARE_TYPES.SHARE_TYPE_GUEST, | |||
this.SHARE_TYPES.SHARE_TYPE_DECK, | |||
] | |||
if (OC.getCapabilities().files_sharing.public.enabled === true) { |
@@ -32,5 +32,6 @@ Object.assign(OC, { | |||
SHARE_TYPE_GUEST: 8, | |||
SHARE_TYPE_REMOTE_GROUP: 9, | |||
SHARE_TYPE_ROOM: 10, | |||
SHARE_TYPE_DECK: 12, | |||
}, | |||
}) |
@@ -31,6 +31,7 @@ export default { | |||
SHARE_TYPE_REMOTE: OC.Share.SHARE_TYPE_REMOTE, | |||
SHARE_TYPE_CIRCLE: OC.Share.SHARE_TYPE_CIRCLE, | |||
SHARE_TYPE_GUEST: OC.Share.SHARE_TYPE_GUEST, | |||
SHARE_TYPE_DECK: OC.Share.SHARE_TYPE_DECK, | |||
SHARE_TYPE_REMOTE_GROUP: OC.Share.SHARE_TYPE_REMOTE_GROUP, | |||
SHARE_TYPE_ROOM: OC.Share.SHARE_TYPE_ROOM, | |||
}, |
@@ -70,6 +70,10 @@ class Constants { | |||
*/ | |||
public const SHARE_TYPE_ROOM = 10; | |||
// const SHARE_TYPE_USERROOM = 11; // Internal type used by RoomShareProvider | |||
/** | |||
* @deprecated 21.0.0 - use IShare::TYPE_ROOM instead | |||
*/ | |||
public const SHARE_TYPE_DECK = 12; | |||
public const FORMAT_NONE = -1; | |||
public const FORMAT_STATUSES = -2; |