From a1d79b2b2bd8bef37c30b5426c94724f9f9d6ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= <danxuliu@gmail.com> Date: Tue, 10 Nov 2020 22:14:12 +0100 Subject: [PATCH] Disable share input for a received share if resharing is not allowed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com> --- .../js/dist/files_sharing_tab.js | Bin 1698903 -> 1698947 bytes .../js/dist/files_sharing_tab.js.map | Bin 4008023 -> 4008140 bytes apps/files_sharing/src/views/SharingTab.vue | 5 ++++- 3 files changed, 4 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 e292d8b59a249fe312729bc952b911095f8688f6..039a1bcda576470481964ef8b354a23698ebaada 100644 GIT binary patch delta 2024 zcmaKtZA?>F7{_x;!CD0C3!bN<qB!e4a&`gng>}{uq%c$jsk%8~&8=LZSlgz(0u@;_ zy9tR=_rYW*bIGFnvdkHyamh`VWri>FgNa+r!sZNHG8M|(tcp`VnC$d+TY7KIKAqd& zeV+gMKhJr3?$5t;eR!wqxQbMZnxk6PTs2RfquSKDs$I=j=cxs1p*ml6s0-AE>LPWq zTBI)d8b806+bhLZM%mT-7&FK3xJx^aV9L&JJ;Ehy`!leg_1YIO@i%;m9e)UOQ7_v% z3qwM;r{c|YV!%`C_eW#FUP+PtrDfe^Wo4y&Esb|eF}ai`(z>6b086D{IqP|VqlLYK z(jAP`067q7_b80-wvyS#@bdhu7p!6ozh(gbF-#2L>=>>#fRQm=k_|o{#~ZVMvzl?d z#Q=uJvBv;vl6VE18ON&)v^a^E8UPP72_<ojA>wutdn>Z)X%{<!@n}d&gr&o>zcUz; z{gJ+~96NR_D~L5rm~_uf;PnRGn-h420nAR|4F*s(iK&<++AfA8iabc;vf}PM5<aK| zBVj=%16d*L^duI`vp~BTk^*w*|C1&s@g~F0Wm9;I)1cBF?2!E(ywFfYVvnZqB18OV zQ}`_dNKWBp1~7lx6mfc*&uDZSFEoU4y43(irg6CeIA%;;YMwF8#z!-zX}WC!TG5~Q z3uI8e@z9iGPnlY>BW2q6WC~XrG`>%nPB`b0DW%p7PH^Bh^f|6b%8~fsU^{WSIt4|H z#v)2YNknBDCN!oq8Y5I56bNl%sVf$zW_yg!qs?AVOsK5bL}<S!CWZwsp?h?)nb1C+ z>>;#KC)I@dbka!ZHg@G1Ud*06!OKt|bIf8uK1OEoK=C0SyS|dpT0Qg-p*?9(#mO#q zeHO1MZ}AAV0ug#diSFWWMM(@r4oaao<vywip>>|-K#zP-5n4ov2-}!6TGYrYzRf9Q z4~L;Zi$29S5!%TXd}oj7*OotRWh3-+Js-btg5fT2ScxTk!Nbvz?5@*ZKEuvjo^aum zeKlXMeq$l|v{^T`p3vR8Dc8}Asb(&+n^3;|Ybx7|Kkdb<J%5RPmUVl%Le&OB>-k!_ znLq5;3$7=$A+24_Nvlp8v@hoYwW5SJ;sCF$uvL@>>EU31FdTOuXkx?(KcEDA;e>Zl zRBK%dL-}aG_UjrbwxYe-Uj$m`<Ryd{Zwy<t2#U2}CB!YLmW@_H32M<^R>AvL)Wk-= zf_j^KAbsNQ1iM%b)m-gfHT0!b4tQYH##P^_hf;+4Sz7~CqB=I*21Nz>CH-IGl?Hgh z#V@`MC3E!tcgT9tj2B&`t!sn}R-VXPx?fwf3%2L-s-ix)YFV2;(tym{myiifKfJ1e z-5D|M^gcL~%jafU8|>qD;%%@4`Lye8aBd-Q#d{Gr$911Z;8Fqi^7$a_$#|*L)3b*` z`Tz!AM@<^9etr(`#>{1SkdqNEXO?TQjmy?wgP+nm#lx^OqqEnn!}w5HwUJ@?(UFO0 z_{Zqu+pr~X$<bF17OT4hEtaNscH$B^=S9Mu!7g`L?pqn9+T}aYh#af*kDM5j^%lEa z%yt(_@?5U;r;pvb0ZX;Dci~zdub8*6Ml1dUMo?}-;Qv>)yWCQw<==--tQkM=Wc&=J MlAxuM&aRxl0rfn?cmMzZ delta 1953 zcmZvdZERCj7{_zkZj6piV2<;Y;l^qf?{SB2Wx(cG5!p+f!hn?#k<EGwcWX!2HNBUP z(v_ER6TXNcG2|q~7%@a65(7+g6EW!YgCG20AOuCTFM<h)A>iH%Lp;3`(^L6$Zhz-F z|NB4x^Yq+fH~W76rSFK2bc=4)ZF-)buP@LG^o6=zFVq+5MS8LRjJ{Z3qA%4;^k?-_ zec2ay_7?L`!a@{f{gZH9>h;vFkIS)@agWpQkH$iASyTMZ>fY+=Y9}9^YEX_TP8wt< zPZR=sbRQo>adz}Ce4;oiX~B?6<79Wd$D^@t)3A~?jpOH*WlyA1G`UYnG&)19@-B81 zX3eqp#xW7V597E&0QL!7A%Ha#c&z}m3EU)r%M;im0P7@vMF3kT@p1uZlerp`c%x8} zoWc%PF@<Sumj52t-jEs%%ZZ3Qp!j=3VZ}c<6j5Ts!&ya)FBJ`bH-%RV;*Y0rxd5bT zyhZ?h)0hh2gJ}!`7@fwhnylCMxWaNk38$#4XpO!5BYU*aU_??#GOLD_&){`}ihm}@ z>&G*=QmD8#gI^ZFidnou0L`;G6{E8lv$L~!sZhr01_9X9xJCdi>6{dfrE|{y`*cpb z<UbIB(f$B`f&|rv55*F;VJ;_x!*e<By)uX0g2scnoD-~nl(QtB3%=x_BrE$Km#WFy zewDp_4_8@efZe}faTra1;}21N!V{C+wd)Ao;)%H;Qi9M{lhhM>z$C4N?l4IMp+hFw zL1_D_5~xK7*s2i#G<2#5l4U+#wAxK*vsvRKbYBM4ak7a$?t=1~evi~F5ow=GrknVz zOLm0^_sC(DaszdQ&<@YmK)<p_llomUk=mI&R@%;LzqS^$d!tZfoJH^>LfhDqEB3*> z%pKCgZd+k3Y~gx7er<#zeXS8KmhgoJqG6@6!*JWck;fODdB^@dA1;1nA%%3aX=*j0 zes(wo6;<<|HggR>p?rAaDced*#!9O}?clSl+s*~*))0D-kM4T@&}HuTAfas;=>|@A znWT-ZfAUvY>18MH;rC6~o$SbcIAkPm<3H`l%Px*XiQOw{G)AbBl8jFm0kxr^abq#G z78LJt$tgMzIuMGejk^PkIN&D~WN8PyfjW)O<#4<Zbs4`_L75G0H>L@6F31l`F`gx> zEP*m3<ObD(n%P(#RG@z2Q60QxLjgAS8MGBNCbdLVX$-P+4bZ^VZZ*JAMrF4L#tOLV zOKsppXbbE1f*W<P(QYU$GH>Vq7GCf|nv0)%6)F~(N48fngJL|WQsc#TIAh}r`6=u& zsyg7cJie=_4=!3>$aFzK;gKg4LNgCf3q3e5W}Mgw@8<DNThR?WxgE6|UPnX5H{Ec0 zDUagKK{(BIrv~AC5%=;@3U<tUX)%{)_m6xClB-a_;Jbgu%G0>}Is9Rr7p`HJ5oqSJ zZ6k0!qf<5to9A`9{-<+o6s|9xpY;Cgar_!I<uBX%)HY--H({G4(8G?N2QV(*gmzRb zRc5|ru9#v5Iy@}=bOmKK)6dE_B{mRJReqHkzTaRZpKq7vx6$za4mS|rbop(#WJCSO NuigRU>K(@=>p%E)tF8b5 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 9490e8eb67c1426886ce7ad9cee8f3a1682d3f57..690c691deb1ae605d83d81fca539e415d459a098 100644 GIT binary patch delta 4535 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 L)Ki}fJYfF=P?})t delta 4351 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 OA2_Prd+$rPy#E5DIV;lu diff --git a/apps/files_sharing/src/views/SharingTab.vue b/apps/files_sharing/src/views/SharingTab.vue index 0371be76a70..979e296d8f9 100644 --- a/apps/files_sharing/src/views/SharingTab.vue +++ b/apps/files_sharing/src/views/SharingTab.vue @@ -90,6 +90,7 @@ import { generateOcsUrl } from '@nextcloud/router' import Avatar from '@nextcloud/vue/dist/Components/Avatar' import axios from '@nextcloud/axios' +import Config from '../services/ConfigService' import { shareWithTitle } from '../utils/SharedWithMe' import Share from '../models/Share' import ShareTypes from '../mixins/ShareTypes' @@ -119,6 +120,8 @@ export default { data() { return { + config: new Config(), + error: '', expirationInterval: null, loading: true, @@ -147,7 +150,7 @@ export default { canReshare() { return !!(this.fileInfo.permissions & OC.PERMISSION_SHARE) - || !!(this.reshare && this.reshare.hasSharePermission) + || !!(this.reshare && this.reshare.hasSharePermission && this.config.isResharingAllowed) }, }, -- GitLab