wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

unified way to display remote shares and mail shares

Browse source 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
Bjoern Schiessle 2016-10-25 16:24:49 +02:00
parent 8c8a019b7e
commit 392c8a115f
No known key found for this signature in database
GPG key ID: 2378A753E2BF04F6
4 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files_sharing/lib/Controller/ShareesAPIController.php
View file

@ -298,7 +298,7 @@ class ShareesAPIController extends OCSController {
$foundRemoteById = true; $foundRemoteById = true;
} }
$this->result['exact']['remotes'][] = [ $this->result['exact']['remotes'][] = [
'label' => $contact['FN'], 'label' => $contact['FN'] . " ($cloudId)",
'value' => [ 'value' => [
'shareType' => Share::SHARE_TYPE_REMOTE, 'shareType' => Share::SHARE_TYPE_REMOTE,
'shareWith' => $cloudId, 'shareWith' => $cloudId,
@ -307,7 +307,7 @@ class ShareesAPIController extends OCSController {
]; ];
} else { } else {
$this->result['remotes'][] = [ $this->result['remotes'][] = [
'label' => $contact['FN'], 'label' => $contact['FN'] . " ($cloudId)",
'value' => [ 'value' => [
'shareType' => Share::SHARE_TYPE_REMOTE, 'shareType' => Share::SHARE_TYPE_REMOTE,
'shareWith' => $cloudId, 'shareWith' => $cloudId,

2
apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
View file

@ -23,8 +23,10 @@
*/ */
namespace OCA\Files_Sharing\Tests\Controller; namespace OCA\Files_Sharing\Tests\Controller;
use OC\ContactsManager;
use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCS\OCSNotFoundException; use OCP\AppFramework\OCS\OCSNotFoundException;
use OCP\Contacts;
use OCP\Files\Folder; use OCP\Files\Folder;
use OCP\IL10N; use OCP\IL10N;
use OCA\Files_Sharing\Controller\ShareAPIController; use OCA\Files_Sharing\Controller\ShareAPIController;

14
core/js/sharedialogshareelistview.js
View file

@ -24,7 +24,7 @@
'{{#if avatarEnabled}}' + '{{#if avatarEnabled}}' +
'<div class="avatar {{#if modSeed}}imageplaceholderseed{{/if}}" data-username="{{shareWith}}" {{#if modSeed}}data-seed="{{shareWith}} {{shareType}}"{{/if}}></div>' + '<div class="avatar {{#if modSeed}}imageplaceholderseed{{/if}}" data-username="{{shareWith}}" {{#if modSeed}}data-seed="{{shareWith}} {{shareType}}"{{/if}}></div>' +
'{{/if}}' + '{{/if}}' +
'<span class="has-tooltip username" title="{{shareWith}}">{{shareWithDisplayName}}</span>' + '<span class="has-tooltip username" title="{{shareWithTitle}}">{{shareWithDisplayName}}</span>' +
'<span class="sharingOptionsGroup">' + '<span class="sharingOptionsGroup">' +
'{{#if editPermissionPossible}}' + '{{#if editPermissionPossible}}' +
'<span class="shareOption">' + '<span class="shareOption">' +
@ -141,6 +141,7 @@
getShareeObject: function(shareIndex) { getShareeObject: function(shareIndex) {
var shareWith = this.model.getShareWith(shareIndex); var shareWith = this.model.getShareWith(shareIndex);
var shareWithDisplayName = this.model.getShareWithDisplayName(shareIndex); var shareWithDisplayName = this.model.getShareWithDisplayName(shareIndex);
var shareWithTitle = '';
var shareType = this.model.getShareType(shareIndex); var shareType = this.model.getShareType(shareIndex);
var hasPermissionOverride = {}; var hasPermissionOverride = {};
@ -148,6 +149,16 @@
shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'group') + ')'; shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'group') + ')';
} else if (shareType === OC.Share.SHARE_TYPE_REMOTE) { } else if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'remote') + ')'; shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'remote') + ')';
} else if (shareType === OC.Share.SHARE_TYPE_EMAIL) {
shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'email') + ')';
}
if (shareType === OC.Share.SHARE_TYPE_GROUP) {
shareWithTitle = shareWith + " (" + t('core', 'group') + ')';
} else if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
shareWithTitle = shareWith + " (" + t('core', 'remote') + ')';
} else if (shareType === OC.Share.SHARE_TYPE_EMAIL) {
shareWithTitle = shareWith + " (" + t('core', 'email') + ')';
} }
return _.extend(hasPermissionOverride, { return _.extend(hasPermissionOverride, {
@ -160,6 +171,7 @@
wasMailSent: this.model.notificationMailWasSent(shareIndex), wasMailSent: this.model.notificationMailWasSent(shareIndex),
shareWith: shareWith, shareWith: shareWith,
shareWithDisplayName: shareWithDisplayName, shareWithDisplayName: shareWithDisplayName,
shareWithTitle: shareWithTitle,
shareType: shareType, shareType: shareType,
shareId: this.model.get('shares')[shareIndex].id, shareId: this.model.get('shares')[shareIndex].id,
modSeed: shareType !== OC.Share.SHARE_TYPE_USER, modSeed: shareType !== OC.Share.SHARE_TYPE_USER,

7
core/js/sharedialogview.js
View file

@ -272,16 +272,9 @@
sharee: text sharee: text
}); });
} else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) { } else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) {
if (item.value.server) {
text = t('core', '{sharee} (at {server})', {
sharee: text,
server: item.value.server
});
} else {
text = t('core', '{sharee} (remote)', { text = t('core', '{sharee} (remote)', {
sharee: text sharee: text
}); });
}
} else if (item.value.shareType === OC.Share.SHARE_TYPE_EMAIL) { } else if (item.value.shareType === OC.Share.SHARE_TYPE_EMAIL) {
text = t('core', '{sharee} (email)', { text = t('core', '{sharee} (email)', {
sharee: text sharee: text