summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2020-01-07 12:57:57 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2020-01-07 19:35:45 +0100
commit445274cf93dbae31c6995008dcc0f9834c05d9ca (patch)
tree5f33fb92ff778f2a7effd66a3bd92e345d4c1bc6 /apps/files
parentfbed6a3416dd96e3698575f67dc57fc861c2ed46 (diff)
downloadnextcloud-server-445274cf93dbae31c6995008dcc0f9834c05d9ca.tar.gz
nextcloud-server-445274cf93dbae31c6995008dcc0f9834c05d9ca.zip
Add pending share list to frontend
Signed-off-by: Julius Härtl <jus@bitgrid.net> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/css/files.scss1
-rw-r--r--apps/files/tests/Controller/ViewControllerTest.php11
2 files changed, 12 insertions, 0 deletions
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
index 40248360c29..bedca77a6f7 100644
--- a/apps/files/css/files.scss
+++ b/apps/files/css/files.scss
@@ -129,6 +129,7 @@
}
.nav-icon-sharingin,
.nav-icon-sharingout,
+.nav-icon-pendingshares,
.nav-icon-shareoverview {
@include icon-color('share', 'files', $color-black);
}
diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php
index fd6ec5aaa3c..f07af2a2fe5 100644
--- a/apps/files/tests/Controller/ViewControllerTest.php
+++ b/apps/files/tests/Controller/ViewControllerTest.php
@@ -288,6 +288,13 @@ class ViewControllerTest extends TestCase {
'order' => 19,
'name' => \OC::$server->getL10N('files_sharing')->t('Deleted shares'),
],
+ [
+ 'id' => 'pendingshares',
+ 'appname' => 'files_sharing',
+ 'script' => 'list.php',
+ 'order' => 19,
+ 'name' => \OC::$server->getL10N('files_sharing')->t('Pending shares'),
+ ],
],
'active' => false,
'icon' => '',
@@ -348,6 +355,10 @@ class ViewControllerTest extends TestCase {
'id' => 'deletedshares',
'content' => null,
],
+ 'pendingshares' => [
+ 'id' => 'pendingshares',
+ 'content' => null
+ ],
'shareoverview' => [
'id' => 'shareoverview',
'content' => null,