sharedWithDisplayName & sharedWithAvatar #5280

ArtificialOwl · 2017-06-07T08:16:47Z

Add displayName and Avatatar to IShare.

mention-bot · 2017-06-07T08:16:48Z

@daita, thanks for your PR! By analyzing the history of the files in this pull request, we identified @rullzer, @blizzz and @schiessle to be potential reviewers.

ArtificialOwl · 2017-06-07T08:18:53Z

This PR fix nextcloud/circles#78 and allow Circles to display its own avatar

LukasReschke

Can I haz some unit tests on the new functions in Share.php? 😇

nickvergessen · 2017-06-13T10:21:47Z

lib/public/Share/IShare.php

+	 * Set the display name of the receiver of this share.
+	 *
+	 * @param string $displayName
+	 * @return \OCP\Share\IShare The modified object


13 everywhere

can I go 12.0.1 ?

I don't think we want to backport this 🙈

Why is wrong on having this on 12.0.1 ?

We only backport serious bug fixes usually 😄

@nickvergessen fixed

ArtificialOwl · 2017-07-06T10:17:53Z

you know have few tests @LukasReschke

MorrisJobke · 2017-12-08T14:52:42Z

lib/public/Share/IShare.php

+	public function setSharedWithAvatar($src);
+
+	/**
+	 * Get the display name of the receiver of this share.


I guess you mean avatar.

MorrisJobke · 2017-12-08T14:52:55Z

@daita Should we try to get this in 13 or is 14 fine?

ArtificialOwl · 2017-12-08T16:35:27Z

14 is fine

MorrisJobke · 2018-03-07T14:35:41Z

Rebased on current master, squashed some commits and updated the @since PHPDoc tags.

Fixed

MorrisJobke

The avatars work nicely 👍

MorrisJobke · 2018-03-07T14:52:46Z

cc @nextcloud/sharing

schiessle · 2018-03-28T12:45:48Z

I just tried it... but no avatars. Maybe something got lost during the rebase?

MorrisJobke · 2018-04-03T08:32:54Z

@daita Also there is another merge conflict :(

MorrisJobke · 2018-04-03T08:35:48Z

Merge conflict caused by 2c073dc - maybe @danxuliu could help to rebase this.

codecov · 2018-04-17T11:28:07Z

Codecov Report

Merging #5280 into master will increase coverage by 0.02%.
The diff coverage is 87.87%.

@@             Coverage Diff              @@
##             master    #5280      +/-   ##
============================================
+ Coverage     51.69%   51.71%   +0.02%     
- Complexity    25744    25751       +7     
============================================
  Files          1643     1643              
  Lines         96506    96536      +30     
  Branches       1393     1396       +3     
============================================
+ Hits          49888    49928      +40     
+ Misses        46618    46608      -10

Impacted Files	Coverage Δ	Complexity Δ
core/js/sharedialogshareelistview.js	`49.48% <100%> (+1.06%)`	`0 <0> (ø)`	⬇️
...iles_sharing/lib/Controller/ShareAPIController.php	`69.95% <100%> (+1.92%)`	`161 <0> (+1)`	⬆️
core/js/sharedialogresharerinfoview.js	`91.42% <50%> (-2.52%)`	`0 <0> (ø)`
core/js/shareitemmodel.js	`88.02% <80%> (-0.13%)`	`0 <0> (ø)`
lib/private/Share20/Share.php	`93.79% <85.71%> (-0.87%)`	`63 <6> (+6)`
apps/files_trashbin/lib/Trashbin.php	`72.7% <0%> (+0.24%)`	`136% <0%> (ø)`	⬇️
core/js/js.js	`65.96% <0%> (+0.55%)`	`0% <0%> (ø)`	⬇️

danxuliu · 2018-04-17T11:49:17Z

Merge conflict caused by 2c073dc - maybe @danxuliu could help to rebase this.

I have rebased again and fixed the conflict; now the display name provided by the circle share is used and, if none is given, then the old code to extract it from share_with is used.

I just tried it... but no avatars. Maybe something got lost during the rebase?

I have fixed that too; avatars were not shown in the list due to ed4b445, as since that commit modSeed was false when using circle avatars, and thus the imageplaceholderseed CSS class was not set.

Note, however, that the default avatar is still shown in the share dialog; showing the circle avatar there would require adding it in the Circles app and then using it from the dialog.

danxuliu · 2018-04-17T11:50:52Z

Oops, tests are failing :-) I will fix them.

Signed-off-by: Maxence Lange <maxence@nextcloud.com> Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Signed-off-by: Maxence Lange <maxence@nextcloud.com>

danxuliu · 2018-05-20T23:42:31Z

Oops, tests are failing :-) I will fix them.

I forgot to push... 🤦

Anyway, I made a good use of my slip by adding more unit tests ;-) I have also rebased the commits onto current master.

This pull request should be ready for review again!

MorrisJobke · 2018-06-29T07:50:07Z

@rullzer @danxuliu Mind to give a final review? Or should we push it to 15?

MorrisJobke · 2018-07-09T12:07:43Z

@rullzer @danxuliu Mind to give a final review? Or should we push it to 15?

Ping 🏓

MorrisJobke · 2018-07-13T15:27:53Z

@skjnldsv @danxuliu Mind to +1?

ArtificialOwl added the 3. to review Waiting for reviews label Jun 7, 2017

ArtificialOwl modified the milestone: Nextcloud 12.0.1 Jun 7, 2017

LukasReschke previously requested changes Jun 12, 2017

View reviewed changes

LukasReschke requested review from nickvergessen and schiessle June 12, 2017 21:12

nickvergessen previously requested changes Jun 13, 2017

View reviewed changes

MorrisJobke added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jun 13, 2017

rullzer added this to the Nextcloud 13 milestone Aug 25, 2017

ArtificialOwl mentioned this pull request Sep 2, 2017

Splits off the logic from sharees endpoint thus making it available from within Nc/via PHP. #6328

Merged

MorrisJobke reviewed Dec 8, 2017

View reviewed changes

MorrisJobke closed this Dec 8, 2017

MorrisJobke reopened this Dec 8, 2017

MorrisJobke modified the milestones: Nextcloud 13, Nextcloud 14 Dec 8, 2017

MorrisJobke force-pushed the shared-with-display-name branch from a5568fe to a5b1357 Compare March 7, 2018 14:35

nextcloud deleted a comment from codecov bot Mar 7, 2018

MorrisJobke approved these changes Mar 7, 2018

View reviewed changes

MorrisJobke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Mar 7, 2018

MorrisJobke requested a review from rullzer March 7, 2018 14:53

MorrisJobke added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Apr 3, 2018

danxuliu force-pushed the shared-with-display-name branch from a5b1357 to 836ac8e Compare April 17, 2018 11:27

ArtificialOwl added 3 commits May 21, 2018 01:24

SharedWithDisplayName + SharedWithAvatar

0009ada

Signed-off-by: Maxence Lange <maxence@nextcloud.com> Signed-off-by: Morris Jobke <hey@morrisjobke.de>

display details on sharing panel

2e3517e

Signed-off-by: Maxence Lange <maxence@nextcloud.com>

tests

4f5814c

Signed-off-by: Maxence Lange <maxence@nextcloud.com>

danxuliu force-pushed the shared-with-display-name branch from 836ac8e to 4f5814c Compare May 20, 2018 23:36

danxuliu added 3. to review Waiting for reviews and removed 2. developing Work in progress labels May 20, 2018

MorrisJobke added the stale Ticket or PR with no recent activity label Jun 19, 2018

nextcloud-bot removed the stale Ticket or PR with no recent activity label Jun 29, 2018

danxuliu mentioned this pull request Jul 12, 2018

Fix formatting of email and circle shares #10224

Merged

danxuliu approved these changes Jul 13, 2018

View reviewed changes

MorrisJobke merged commit 82021b2 into master Jul 13, 2018

MorrisJobke deleted the shared-with-display-name branch July 13, 2018 15:30

Uh oh!

sharedWithDisplayName & sharedWithAvatar #5280

sharedWithDisplayName & sharedWithAvatar #5280

Uh oh!

Conversation

ArtificialOwl commented Jun 7, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mention-bot commented Jun 7, 2017

Uh oh!

ArtificialOwl commented Jun 7, 2017

Uh oh!

LukasReschke left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ArtificialOwl commented Jul 6, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MorrisJobke commented Dec 8, 2017

Uh oh!

ArtificialOwl commented Dec 8, 2017

Uh oh!

MorrisJobke commented Mar 7, 2018

Uh oh!

MorrisJobke left a comment

Choose a reason for hiding this comment

Uh oh!

MorrisJobke commented Mar 7, 2018

Uh oh!

schiessle commented Mar 28, 2018

Uh oh!

MorrisJobke commented Apr 3, 2018

Uh oh!

MorrisJobke commented Apr 3, 2018

Uh oh!

codecov bot commented Apr 17, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

danxuliu commented Apr 17, 2018

Uh oh!

danxuliu commented Apr 17, 2018

Uh oh!

danxuliu commented May 20, 2018

Uh oh!

MorrisJobke commented Jun 29, 2018

Uh oh!

MorrisJobke commented Jul 9, 2018

Uh oh!

MorrisJobke commented Jul 13, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

ArtificialOwl commented Jun 7, 2017 •

edited

Loading

codecov bot commented Apr 17, 2018 •

edited

Loading