Skip to content

nmc/4516-files-sharing-password-disabled-after-editing-advanced-permission-without-changes-to-password #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
suet-kei-chan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

nmc/4516-files-sharing-password-disabled-after-editing-advanced-permission-without-changes-to-password #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions l10n/de.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ OC.L10N.register(
'With File drop, only uploading is allowed. Only you can see files and folders that have been uploaded.': 'Bei der Sammelbox ist nur das Hochladen erlaubt. Nur Sie sehen Dateien und Ordner die hochgeladen worden sind.',
'Advanced': 'Erweiterte',
'Set password': 'Passwortschutz',
'Password set': 'Passwort gesetzt',
'Change password': 'Passwort ändern',
'Your shares': 'Ihre Freigaben',
'Manage access': 'Zugriff verwalten',
'Send': 'Send',
Expand Down
2 changes: 2 additions & 0 deletions l10n/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
"Please note that resharing is only available for internal sharing, i.e. sharing with other MagentaCLOUD users.": "Bitte beachten sie, dass das Weiterteilen, nur beim internen Teilen, also dem Teilen an andere MagentaCLOUD Nutzer, verfügbar ist.",
"Advanced settings": "Erweiterte Einstellungen",
"Set password": "Passwort setzen",
"Password set": "Passwort gesetzt",
"Change password": "Passwort ändern",
"Your shares": "Ihre Freigaben",
"Manage access": "Zugriff verwalten",
"Here you can see who has access to your file/folder.": "Hier sehen Sie wer Zugriff auf Ihre Datei/Ihren Ordner hat.",
Expand Down
2 changes: 2 additions & 0 deletions l10n/de_DE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
"Please note that resharing is only available for internal sharing, i.e. sharing with other MagentaCLOUD users.": "Bitte beachten sie, dass das Weiterteilen, nur beim internen Teilen, also dem Teilen an andere MagentaCLOUD Nutzer, verfügbar ist.",
"Advanced settings": "Erweiterte Einstellungen",
"Set password": "Passwort setzen",
"Password set": "Passwort gesetzt",
"Change password": "Passwort ändern",
"Your shares": "Ihre Freigaben",
"Manage access": "Zugriff verwalten",
"Here you can see who has access to your file/folder.": "Hier sehen Sie wer Zugriff auf Ihre Datei/Ihren Ordner hat.",
Expand Down
2 changes: 2 additions & 0 deletions l10n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
"Please note that resharing is only available for internal sharing, i.e. sharing with other MagentaCLOUD users.": "Please note that resharing is only available for internal sharing, i.e. sharing with other MagentaCLOUD users.",
"Advanced settings": "Advanced settings",
"Set password": "Set password",
"Password set": "Password set",
"Change password": "Change password",
"Your shares": "Your shares",
"Manage access": "Manage Access",
"Here you can see who has access to your file/folder.": "Here you can see who has access to your file/folder.",
Expand Down
2 changes: 2 additions & 0 deletions l10n/en_GB.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ OC.L10N.register(
'With File drop, only uploading is allowed. Only you can see files and folders that have been uploaded.': 'With File drop, only uploading is allowed. Only you can see files and folders that have been uploaded.',
'Advanced': 'Advanced',
'Set password': 'Set password',
'Password set': 'Password set',
'Change password': 'Change password',
'Your shares': 'Your shares',
'Manage access': 'Manage Access',
'Send': 'Send',
Expand Down
2 changes: 2 additions & 0 deletions l10n/en_GB.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
"Please note that resharing is only available for internal sharing, i.e. sharing with other MagentaCLOUD users.": "Please note that resharing is only available for internal sharing, i.e. sharing with other MagentaCLOUD users.",
"Advanced settings": "Advanced settings",
"Set password": "Set password",
"Password set": "Password set",
"Change password": "Change password",
"Your shares": "Your shares",
"Manage access": "Manage Access",
"Here you can see who has access to your file/folder.": "Here you can see who has access to your file/folder.",
Expand Down
48 changes: 43 additions & 5 deletions src/views/SharingDetailsTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,20 @@
{{ t('files_sharing', 'Hide download') }}
</NcCheckboxRadioSwitch>
<template v-if="isPublicShare">
<NcCheckboxRadioSwitch :checked.sync="isPasswordProtected" :disabled="isPasswordEnforced">
{{ passwordHint }}
</NcCheckboxRadioSwitch>
<NcPasswordField v-if="isPasswordProtected"
<div class="password-row">
<NcCheckboxRadioSwitch :checked.sync="isPasswordProtected" :disabled="isPasswordEnforced">
{{ passwordHint }}
</NcCheckboxRadioSwitch>
<NcButton v-if="passwordIsChecked && !showPasswordField"
type="tertiary"
@click="showPasswordField = true">
{{ t('nmcsharing', 'Change password') }}
<template #icon>
<PencilIcon :size="16" />
</template>
</NcButton>
</div>
<NcPasswordField v-if="isPasswordProtected && (!passwordIsChecked || showPasswordField)"
id="share-password-input"
:value="hasUnsavedPassword ? mutableShare.password : ''"
:error="passwordError"
Expand Down Expand Up @@ -215,6 +225,7 @@ export default {
bundledPermissions: BUNDLED_PERMISSIONS,
passwordError: false,
passwordIsChecked: false,
showPasswordField: false,
mutableShare: {
note: this.share.note,
password: this.share.password,
Expand Down Expand Up @@ -540,7 +551,7 @@ export default {
},
passwordHint() {
if (this.passwordIsChecked) {
return t('files_sharing', 'Replace current password')
return t('nmcsharing', 'Password set')
} else {
return t('nmcsharing', 'Set password')
}
Expand Down Expand Up @@ -755,6 +766,33 @@ export default {

}

.password-row {
display: flex;
flex-direction: row;
align-items: center;

.button-vue--vue-tertiary {
min-height: unset;
height: 24px;
padding: 0 4px;
font-size: 0.8rem;
color: var(--color-main-text);

.button-vue__wrapper {
flex-direction: row-reverse;
}

.button-vue__text {
font-weight: bold;
}

&:hover {
color: var(--color-primary-element);
background-color: transparent;
}
}
}

.checkbox-text {
display: flex;
flex-direction: row;
Expand Down
Loading