diff options
| -rw-r--r-- | js/circles.app.elements.js | 2 | ||||
| -rw-r--r-- | lib/Api/Sharees.php | 8 | ||||
| -rw-r--r-- | lib/ShareByCircleProvider.php | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/js/circles.app.elements.js b/js/circles.app.elements.js index 4e061ebf..72a8bc55 100644 --- a/js/circles.app.elements.js +++ b/js/circles.app.elements.js @@ -357,7 +357,7 @@ var elements = { generateTmplMember: function (entry) { var tmpl = $('#tmpl_member').html(); -console.log(JSON.stringify(entry)); + tmpl = tmpl.replace(/%username%/g, escapeHTML(entry.user_id)); tmpl = tmpl.replace(/%displayname%/g, escapeHTML(entry.display_name)); tmpl = tmpl.replace(/%level%/g, escapeHTML(entry.level)); 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() ) ); } |