From 455013c3098d0ef2232e1f0c60aeb1f0b94b91ca Mon Sep 17 00:00:00 2001 From: GretaD Date: Mon, 16 Dec 2019 17:12:20 +0100 Subject: [PATCH] fix the folder share Signed-off-by: GretaD Signed-off-by: npmbuildbot[bot] --- .../js/dist/files_sharing_tab.js | Bin 1315744 -> 1316979 bytes .../js/dist/files_sharing_tab.js.map | Bin 3485752 -> 3488837 bytes .../src/components/SharingEntry.vue | 28 +++++++++++++----- .../bootstrap/FilesAppSharingContext.php | 8 ++--- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js b/apps/files_sharing/js/dist/files_sharing_tab.js index 9987b4363e6099f94c5eba00b5c20583343bb6bf..27a3904f48288d6ad9f84ba7cee5fd4410f89803 100644 GIT binary patch delta 1033 zcmZ`&O=}ZT6eVfmOg>uE-eM~FkyHyU3?WsUmXTOO6QO8rY@rK9!k9eGV3N_9u?jV$ zNI(}ZEEMj>MMR;Xh(!v6Ai8nm!hQ&$T1xFtP(*Z9e3O}W+NLhf=ALurocrFJ%1rXt zY;v+}E8EKrWk=ar-Z#gbPO*`6Pq?=`62|pudmFwU^0hq3rx*&B!bRbx@KAUu8Y!A6 z_EY#MnzekY<@XEsiQdT7p58ukWdenYFMyBS(8+ENF*fDxz(WqW%$PD<9BMj<71ia% ztOo*?@+S*`YYuR0uRL)0y>mb&f{N>t;6Hwo$azswM5&;}Nsg$5A07xL6C*=|qoaev z7gF)W`GofF6I^s2oe-5oMpOr~Bz=Qqc(vG7EOKd~Q2QF;G055cIC-gs!O!!+G|(|F z&qE|geTJmYX(sM+I`lDqorfNvRzqW1@yG(?4p3r*C|N-!7SmP4{6px|o-DvO8?LfW z78n0G&Xji4<_ghqNz4So(P)(Pt65PA(G~Q)c*4n1HMFZNCt7-WOK+|$b5hN*qa!C+ z4v9MAMufSm#3?n)&h}i)@+ey=riNFzG?tdYKPDQ~wmUP6guCu_3U#Czsgs2|vbM5L z#qiA%blcLnF%3b@`31xVkA4hirCf%{{rGeRS{r3@jc?z)YkXVkm;ZTt{gII$ZzBtgT^W8XN7EX)xO| zjlmw78U2}?na9vK3$1v+3U9qeBf0jfaJUL5@$YkJ#?nie!ygs93j;I2Xy=yU7GwQc OAI3aw+Ugp7JoOI)$aq%( delta 374 zcmeyoAz;DsfQA;v7N!>F7M2#)7Pc+y*75A-Miz-iCdtzU_wY(iU+*g*)Ses94#XTl z%n8I?K+FxqJV49~#C$-^55xjMEVw;4Ug+y8E;Az|L(9bE#MtWTi3 zr#nvMQJpTsA{>Pfy5P$vIekG1C(rZ@Zeaz4_(u+5;pz8Sgt@k_caYkZM>h!D&!Z`vkLD!T_pbE{}=`Wgu9j4b^5|-Ltb5XdFaeDV9 zHhw+5g4Cki%;MtA{Ji3z)Wnn;jS_pXP9$-V304N0H5#eYi?0Y9GUiSHH$_-+`>`v+ znatDqmI;eY_q!p?F+K8@@J24@#5{!}ursDlydx|Nmfr4pTiA^Q;f?)a+!EW@KNdb> F0swAegarTq 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 b1bc871d6b20da355b1dee0570e8e896ef170028..bfc16fb295240500bf5685f18c706820c6e0a246 100644 GIT binary patch delta 2565 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 diff --git a/apps/files_sharing/src/components/SharingEntry.vue b/apps/files_sharing/src/components/SharingEntry.vue index ad36361b9c..a19d1331f6 100644 --- a/apps/files_sharing/src/components/SharingEntry.vue +++ b/apps/files_sharing/src/components/SharingEntry.vue @@ -42,12 +42,24 @@ {{ t('files_sharing', 'Allow creating') }} + + + + {{ t('files_sharing', 'Allow deleting') }} + + - - - {{ t('files_sharing', 'Allow deleting') }} - checkbox("Can reshare") can not be used here; that would // return the checkbox itself, but the element that the user interacts // with is the label. - return Locator::forThe()->xpath("//label[normalize-space() = 'Can reshare']")-> + return Locator::forThe()->xpath("//label[normalize-space() = 'Allow resharing']")-> descendantOf(self::shareWithMenu($sharedWithName))-> - describedAs("Can reshare checkbox in the share with $sharedWithName menu in the details view in Files app"); + describedAs("Allow resharing checkbox in the share with $sharedWithName menu in the details view in Files app"); } /** * @return Locator */ public static function canReshareCheckboxInput($sharedWithName) { - return Locator::forThe()->checkbox("Can reshare")-> + return Locator::forThe()->checkbox("Allow resharing")-> descendantOf(self::shareWithMenu($sharedWithName))-> - describedAs("Can reshare checkbox input in the share with $sharedWithName menu in the details view in Files app"); + describedAs("Allow resharing checkbox input in the share with $sharedWithName menu in the details view in Files app"); } /**