Skip to content

Allow internal shares to have a default expiration date - #17725

Merged
rullzer merged 8 commits into
masterfrom
enh/share_exp_internal
Nov 28, 2019
Merged

Allow internal shares to have a default expiration date#17725
rullzer merged 8 commits into
masterfrom
enh/share_exp_internal

Conversation

@rullzer

@rullzerrullzer commented Oct 28, 2019•
edited
Loading

Copy link
Copy Markdown
Member

TODO:

  • Needs admin UI
    • basics
    • Fix the js so it opens etc.
  • Needs more checks
  • Expose variables
  • Need integration of enforcement and max date into the sidebar
  • Actually expire the share
  • Expose in capabilities

Signed-off-by: Roeland Jago Douma roeland@famdouma.nl

@rullzerrullzer added this to the Nextcloud 18 milestone Oct 28, 2019
@rullzer

rullzer commented Oct 29, 2019

Copy link
Copy Markdown
MemberAuthor

Actually the new sidebar already enforces expiration dates. It just takes the link share one.
I guess it makes sense to make sure that this is split in link shares and others. (as links are somewhat special). @skjnldsv can you have a look?

skjnldsv
skjnldsv reviewed Nov 13, 2019
View reviewed changes
Comment threadapps/settings/templates/settings/admin/sharing.php Outdated
@skjnldsv
skjnldsvforce-pushed the enh/share_exp_internal branch from 4c1af0b to 5f7070cCompareNovember 13, 2019 14:44
@skjnldsv

skjnldsv commented Nov 13, 2019

Copy link
Copy Markdown
Member

/compile /

@skjnldsvskjnldsv added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Nov 13, 2019
@rullzer

rullzer commented Nov 13, 2019

Copy link
Copy Markdown
MemberAuthor

Time for the reviews and to get in!

ChristophWurst
ChristophWurst reviewed Nov 14, 2019
View reviewed changes

@ChristophWurstChristophWurst left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested enforced expiration.

Works nicely for new new shares. For existing ones the expiration checkbox is now checked, but now date is set. Bug?

Comment threadapps/settings/templates/settings/admin/sharing.php
@rullzer

rullzer commented Nov 14, 2019

Copy link
Copy Markdown
MemberAuthor

Tested enforced expiration.

Works nicely for new new shares. For existing ones the expiration checkbox is now checked, but now date is set. Bug?

I think that is the same on link shares.
So lets keep it for now 😉

@rullzer

rullzer commented Nov 14, 2019

Copy link
Copy Markdown
MemberAuthor

@ChristophWurst so... approve?

@ChristophWurstChristophWurst added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Nov 15, 2019
@rullzerrullzer added 2. developing Work in progress and removed 4. to release Ready to be released and/or waiting for tests to finish labels Nov 17, 2019
@rullzer

rullzer commented Nov 17, 2019

Copy link
Copy Markdown
MemberAuthor

Ah shit failing CI.
I'll fix that..

rullzerand others added 5 commits November 27, 2019 14:33
@rullzer
Allow internal shares to have a default expiration date
21d7383
* Needs admin UI
* Needs more checks
* Basics seem to work
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer
My first stupid attempt at expanding the admin interface
96eedc5
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer
Actualy return data
0c0ca45
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer
Expose internal expiration dates to JS
efce1fd
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@skjnldsv@rullzer
Add settings front and split sharing entry config
444c9b6
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
rullzerand others added 3 commits November 27, 2019 14:33
@rullzer
Add capabilities
8797ff7
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@npmbuildbot@rullzer
Compile assets
d441864
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
@rullzer
Fix tests
078f4ef
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer
rullzerforce-pushed the enh/share_exp_internal branch from ffc984e to 078f4efCompareNovember 27, 2019 13:52
@rullzer
rullzer merged commit 62dc320 into masterNov 28, 2019
@rullzer
rullzer deleted the enh/share_exp_internal branch November 28, 2019 07:37
@skjnldsvskjnldsv mentioned this pull request Nov 12, 2020
Merged
@danxuliudanxuliu mentioned this pull request Nov 12, 2020
Merged
@ChristophWurstChristophWurst mentioned this pull request Nov 24, 2020
Merged
@joshtrichardsjoshtrichards mentioned this pull request Aug 18, 2024
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChristophWurstChristophWurstChristophWurst approved these changes
@skjnldsvskjnldsvskjnldsv approved these changes
@juliusknorrjuliusknorrAwaiting requested review from juliusknorr

Assignees

@rullzerrullzer

@skjnldsvskjnldsv

Labels

2. developingWork in progressenhancementfeature: sharing

Projects

None yet

Milestone

Nextcloud 18.0.0

Development

Successfully merging this pull request may close these issues.

3 participants

@rullzer@skjnldsv@ChristophWurst