Added more columns to ext storage list

Now using system mount and personal mount calls to get the relevant
mount points including backend information.
This commit is contained in:
Vincent Petry 2014-06-06 13:50:41 +02:00
parent a47ef52ae2
commit 710d017eec
3 changed files with 55 additions and 22 deletions

View File

@ -29,8 +29,16 @@
_createRow: function(fileData) { _createRow: function(fileData) {
// TODO: hook earlier and render the whole row here // TODO: hook earlier and render the whole row here
var $tr = OCA.Files.FileList.prototype._createRow.apply(this, arguments); var $tr = OCA.Files.FileList.prototype._createRow.apply(this, arguments);
var $scopeColumn = $('<td></td>');
var $backendColumn = $('<td></td>');
var scopeText = t('files_external', 'Personal');
if (fileData.scope === 'system') {
scopeText = t('files_external', 'System');
}
$tr.find('.filesize,.date').remove(); $tr.find('.filesize,.date').remove();
$tr.find('td.filename').after('<td></td>'); $scopeColumn.text(scopeText);
$backendColumn.text(fileData.backend);
$tr.find('td.filename').after($scopeColumn).after($backendColumn);
$tr.find('td.filename input:checkbox').remove(); $tr.find('td.filename input:checkbox').remove();
return $tr; return $tr;
}, },

View File

@ -24,6 +24,39 @@ namespace OCA\Files\External;
class Api { class Api {
/**
* Formats the given mount config to a mount entry.
*
* @param bool $isSystemMount true for system mount, false
* for personal mount
*
* @return array entry
*/
private static function formatMount($mountConfig, $isSystemMount = false) {
// split user name from mount point
$path = dirname($mountConfig['mountpoint']);
if ($path === '.') {
$path = '';
}
$permissions = \OCP\PERMISSION_READ;
// personal mounts can be deleted
if (!$isSystemMount) {
$permissions |= \OCP\PERMISSION_DELETE;
}
// TODO: add storageType, might need to use another OC_Mount_Config method
$entry = array(
'name' => basename($mountConfig['mountpoint']),
'path' => $path,
'type' => 'dir',
'backend' => $mountConfig['backend'],
'scope' => ( $isSystemMount ? 'system' : 'personal' ),
'permissions' => $permissions
);
return $entry;
}
/** /**
* Returns the mount points visible for this user. * Returns the mount points visible for this user.
* *
@ -33,30 +66,16 @@ class Api {
public static function getUserMounts($params) { public static function getUserMounts($params) {
$entries = array(); $entries = array();
$user = \OC_User::getUser(); $user = \OC_User::getUser();
$mounts = \OC_Mount_Config::getAbsoluteMountPoints($user);
foreach ($mounts as $mountPoint => $config) { $personalMounts = \OC_Mount_Config::getPersonalMountPoints();
// split user name from mount point $systemMounts = \OC_Mount_Config::getSystemMountPoints();
$parts = explode('/', ltrim($mountPoint, '/'));
array_shift($parts); // use name
array_shift($parts); // files
$mountPoint = implode('/', $parts);
$path = dirname($mountPoint); foreach ($systemMounts as $mountConfig) {
if ($path === '.') { $entries[] = self::formatMount($mountConfig, true);
$path = '';
} }
// TODO: give delete permissions if mount type is personal foreach ($personalMounts as $mountConfig) {
$permissions = \OCP\PERMISSION_READ; $entries[] = self::formatMount($mountConfig, false);
// TODO: add storageType, might need to use another OC_Mount_Config method
$entries[] = array(
'name' => basename($mountPoint),
'path' => $path,
'type' => 'dir',
'permissions' => $permissions
);
} }
return new \OC_OCS_Result($entries); return new \OC_OCS_Result($entries);

View File

@ -16,6 +16,12 @@
<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a> <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
</div> </div>
</th> </th>
<th id="headerBackend" class="hidden column-backend">
<a class="backend sort columntitle" data-sort="backend"><span><?php p($l->t('Storage type')); ?></span><span class="sort-indicator"></span></a>
</th>
<th id="headerScope" class="hidden column-size">
<a class="scope sort columntitle" data-sort="scope"><span><?php p($l->t('Scope')); ?></span><span class="sort-indicator"></span></a>
</th>
</tr> </tr>
</thead> </thead>
<tbody id="fileList"> <tbody id="fileList">