From 1da890150d11d892affdf6a1c250bfba1ef9945a Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 20 Aug 2020 12:03:46 +0200
Subject: [PATCH] Only copy the link when updating a share or no password was
forced
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
---
.../js/dist/files_sharing_tab.js | Bin 1288876 -> 1288919 bytes
.../js/dist/files_sharing_tab.js.map | Bin 3311196 -> 3311445 bytes
.../src/components/SharingEntryLink.vue | 6 +++++-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js b/apps/files_sharing/js/dist/files_sharing_tab.js
index d052c4ec6a851ad466d3f8cf412f88b57410bfa6..ae23ffb93e71ac23d689e8d33cbb200fc4f3f509 100644
GIT binary patch
delta 327
zcmZ2;)$jUMzlIjZ7N!>F7M2#)Eo{FPI82R_Q_T{MjHYiq%c0V)uE++&>_E%`#GF9P
z1;pGy%mc){K+Ffk{6H+QU0qR7xQ)Xw$-=_a%+hT7!94;>)8&c<br3=y9R-A^Pf+6&
zoUZqTO?>*l)q<+ie=HX?K&UWSAvl!_W<+fD^uXh6qSNnO2NKyU1$n2ltrXNlD7INC
z=!@V@Tq&50to6W3L7nMZs|3Xnf;!VLt`wA>p0-L*388PoDnT1|sFl+N$^?z4C-8EJ
pZI@XsIBNo{Vu_ks-t-T_LTcN$Sqqt&!?m@4DH7WLrAT;(IRI3wWN82Z
delta 317
zcmcb9)o;yJzlIjZ7N!>F7M2#)Eo{FPIFd{Zj8an5jHYiq%c0V)uE++&>_E%`#GF9P
z1;pGy%mc){K+Ffk{6H+QU0qR7xQ)Zu#N0eJ#mI8{!94;>)8&c<br3=y9R-A^Pf+6&
zoUZqTO?>*l)q<+ie=HX?K&UWSAvl!_W<+fD^uXh6qSNnO2NKyU1$n2ltrXNlD7INC
z=!@V@Tq&50to6W3L7nMZs|3Xnf;!VLt`wA>p0-L*388PoDnT0rPq0kTXnF!KhuC(R
b)q=AoY=3AiWM&SRZkI0>+Ad!#yu%y-ilSlA
diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js.map b/apps/files_sharing/js/dist/files_sharing_tab.js.map
index fde9f1543a723831630470d6c7829691160aa20e..c27e7ceac1e6fbb9633a1b280d0fb3f131a09030 100644
GIT binary patch
delta 1127
zcmY+BOH30{6oyl+yc7qh4-g8&Lmp+O(}!(JVvyTXh!l!K0>Nl-C__6?+R`bhL=r<>
zbVG<qqj#f*EiooV7u^{buGkTDVSvVHg6@pb7<FO%XAG@o^8I(tx##@n-rT*_E!~^7
zEnTLwRWDB29qEOk?&tHZN9y&Wt;>n1Pk%|2>}j39J)Ie@edhgLqIU%(YkHHkrF#a;
z?>hY{r(Xw-fTKVUj)5Xj3`#&LC<DjA2~eJO`cM9R-yC$4q=#@859ueINbLBZ>m@EM
zUeX2i5f}AYnT{LrUcxP*7>h`5L4$oH=tZ@g%w8tkD3PK4MD6#eidv}bA;W|V5W7}l
zJ1ntz$dH;24-jsg%n#6QD`PB~^{J8Uqu;HJQk)o6BZbCn%v3|zua205Y9kgsWK<jN
zKxUjc=@%Pg49s3pgE^>08;*<M2%T;+fzx_O=&EK9{kuKitKJ!kqf8LHwtE4Z)S4IE
z>d8k*Y((u!LYF+=cxu7UfC^9vs(=BU0;j<la28a98gLHOg1YR2-T3WsiFL~5ayYx3
z*~(W&PFL)(1th0vOReu1K|N>yENBExpc%A)^Pm;9fp*XVOrR5R+4UWMPoFoZFt5qJ
z80SZH^z&Q3`Tq?X8|6O~Qk&}yO|)m1=L#w7lO_W-Z}UU+^)7EIJ3RA^+cfjZbcWvh
zYO0_&4@?HyzsFxIv~BG1!P0y&6*ub5w11zkFH{JQ)*9OV(Ns)hWpxaFxX)ks*BvoO
zi*o$gLXx9T_xW1t&hbqJn{bZ5n2%DK9G}hP%+)Ifd4_FYj7^IPiCtc18xtW}p)2==
z7U~-lm^*^N4oAXEY#<t2ViO^W4a<=^HW`v4S`-r%B^ixRvq@25Bhdsq6O9L?Y3_RD
zdgAbdMHHR!q^w9<)1o59*@z@fD{LaFIScT?eAPeiI3>aBoW#z^5m^bzk)XD%gv7XH
zR_*D_NuhzJ$Aqfv!KCn@Gk-T4{$&<u_o`4$Gi_#z`j`gwuZps(LSLaweQz3TH~;gj
Tlkd!rQp}nFELmpFI`rcY6<&E!
delta 944
zcmZ9|OH30%7zgmQ6e%b!ic)!$@+^gRw%vAVsS<G7@{|^#iN+X{@~9Xd0wK^6qhK`Y
zMI@$)a{>=0Ud52OR}XsOgd`9WULsdKsR<?!{cjN$Jp8`N_susmyWjHj1=aeq1=XC{
zs1b#*BR=e}nIAB!^OHIqUGZ(NDL&V#i@)`2lWU!ol^u!geV;m2)74!i#^2Gh_|=y5
zC(c038Bl>5l0XB=a0*gD3#pI>r{N5wOU}UAUtjaWG~%U}4jM)5^HCd?Iw~Muqc+wq
zaOK6lK57~F&_OI6bO^Dho{CudJk-@lEkWvRWU~U7YZz;ivr)tbiVN&s>Zg`2>PF!v
zH8-(UfzxYU&2r{!W(NW{lG5KIXMHSU=Q<5;v<GPwV&eR$mj)BBL<4fuINP(!=Ue5Z
zs+H*-oX%HyJ#ibN%_F}#;G+$Rh)ZtKu{L=(f*48c4tpq02kE_bxju+E?yc*MMI9Vu
zz&SV%nQ#FvLKf)Y5@bUT<U*blb?AT0rZ_~GE8J~obeZHxQ%m|xm9|r~*}KDc?NZAp
z{ZkctbYSIPe$;2M-EC5M*b<vq(L+8Mpa2S?2#TQuO2G(aV1ja}05e#mi4~$zpL~0(
zjkK#+Xq6Nnum5Bp7Kv8-_bc7(v(`|=8rFzKDZQ94Dq*kINPpT<*PRFK@%IWNyRuFO
zl)kxj(xYUC4dPd_$))UUHk6i^#a?d^QK@fjkUAx^Y?4|f8`&h)N@l)I>ZRHnq~`yD
z9sbwR5Mvmkw7bpkJY?@fR-LpOvd);5Tke<fBCDRVX0n1sK7(C;!{@Run|$)I+BY{}
jDyJvLl*1;ctULb(7ux4%+3#|`AZD7jf=x0_3uNyPC`LiN
diff --git a/apps/files_sharing/src/components/SharingEntryLink.vue b/apps/files_sharing/src/components/SharingEntryLink.vue
index e81482e43bd..3ba4e59867e 100644
--- a/apps/files_sharing/src/components/SharingEntryLink.vue
+++ b/apps/files_sharing/src/components/SharingEntryLink.vue
@@ -708,7 +708,11 @@ export default {
// Execute the copy link method
// freshly created share component
// ! somehow does not works on firefox !
- component.copyLink()
+ if (update || !this.config.enforcePasswordForPublicLink) {
+ // Only copy the link when the password was not forced,
+ // otherwise the user needs to copy/paste the password before finishing the share.
+ component.copyLink()
+ }
} catch ({ response }) {
const message = response.data.ocs.meta.message
--
GitLab