Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/circles.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMaxence Lange <maxence@nextcloud.com>2017-06-15 13:31:06 +0300
committerMaxence Lange <maxence@nextcloud.com>2017-06-15 13:31:06 +0300
commitef8782552638d927037c0abc90d42c60c403f854 (patch)
treed31cf62a6be6d94bfc274704a7603b5b94b5a9de /lib
parent66e2aa7b08972777c8eb1e14c92693cb6f03930c (diff)
Displaying name instead of uuid - #83
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/Api/Sharees.php8
-rw-r--r--lib/ShareByCircleProvider.php4
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/Api/Sharees.php b/lib/Api/Sharees.php
index 0e25ecf7..4360905f 100644
--- a/lib/Api/Sharees.php
+++ b/lib/Api/Sharees.php
@@ -83,8 +83,12 @@ class Sharees {
'shareType' => Share::SHARE_TYPE_CIRCLE,
'shareWith' => $entry->getId(),
'circleInfo' => $entry->getInfo(),
- 'circleOwner' => $entry->getOwner()
- ->getUserId()
+ 'circleOwner' => \OC::$server->getUserManager()
+ ->get(
+ $entry->getOwner()
+ ->getUserId()
+ )
+ ->getDisplayName()
],
];
diff --git a/lib/ShareByCircleProvider.php b/lib/ShareByCircleProvider.php
index 7d5f5b0b..45fd5a1a 100644
--- a/lib/ShareByCircleProvider.php
+++ b/lib/ShareByCircleProvider.php
@@ -345,7 +345,7 @@ class ShareByCircleProvider extends CircleProviderRequestBuilder implements ISha
$data['share_with'] =
sprintf(
'%s (%s, %s)', $data['circle_name'], Circle::TypeLongString($data['circle_type']),
- $data['circle_owner']
+ \OC::$server->getUserManager()->get($data['circle_owner'])->getDisplayName()
);
return $data;
@@ -565,7 +565,7 @@ class ShareByCircleProvider extends CircleProviderRequestBuilder implements ISha
sprintf(
'%s (%s, %s)', $data['circle_name'],
Circle::TypeLongString($data['circle_type']),
- $data['circle_owner']
+ \OC::$server->getUserManager()->get($data['circle_owner'])->getDisplayName()
)
);
}