Skip to content

Allow enforcing share passwords only when already asking for a password #38227

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

Merged
nickvergessen merged 7 commits into from
May 22, 2023
Merged

Allow enforcing share passwords only when already asking for a password #38227

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
74bddb7
Add missing end tag for "label"
danxuliu May 12, 2023
8fa09be
Move "br" immediately after "label" for consistency with other elements
danxuliu May 12, 2023
f9039b4
Replace "div" with "span" inside "p"
danxuliu May 12, 2023
2c97bca
Indent "Enforce password protection"
danxuliu May 12, 2023
6daf962
Split long line
danxuliu May 12, 2023
2c1a1b1
Disable "Enforce password protection" if not asking for a password
danxuliu May 12, 2023
c1f3bcf
chore(assets): Recompile JS
nickvergessen May 22, 2023
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
Prev Previous commit
Next Next commit
Indent "Enforce password protection" 
"Enforce password protection" is a subcase of "Always ask for a
password", so it should be indented to visually show the dependency.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu @nickvergessen
danxuliu authored and nickvergessen committed May 22, 2023
commit 2c97bca5d0c36c5a05491ed695d6cfb1bd4e65ff
6 changes: 3 additions & 3 deletions apps/settings/templates/settings/admin/sharing.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,12 @@
value="1" <?php if ($_['enforceLinkPassword']) {
print_unescaped('checked="checked"');
} ?> />
<label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/>
<label for="enforceLinkPassword" class="indent"><?php p($l->t('Enforce password protection'));?></label><br/>

<?php if ($_['passwordExcludedGroupsFeatureEnabled']) { ?>
<span id="selectPasswordsExcludedGroups" class="indent <?php if (!$_['enforceLinkPassword']) { p('hidden'); } ?>">
<span id="selectPasswordsExcludedGroups" class="double-indent <?php if (!$_['enforceLinkPassword']) { p('hidden'); } ?>">
<label for="shareapi_enforce_links_password_excluded_groups"><?php p($l->t('Exclude groups from password requirements:'));?></label><br/>
<input name="shareapi_enforce_links_password_excluded_groups" id="passwordsExcludedGroups" value="<?php p($_['passwordExcludedGroups']) ?>" style="width: 400px" class="noJSAutoUpdate indent"/>
<input name="shareapi_enforce_links_password_excluded_groups" id="passwordsExcludedGroups" value="<?php p($_['passwordExcludedGroups']) ?>" style="width: 400px" class="noJSAutoUpdate double-indent"/>
</span><br/>
<?php } ?>

Expand Down