subs: Limit editing subscribers for waiting period users. #10106
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
timabbott
reviewed
Jul 30, 2018
zerver/models.py
Outdated
| if diff >= self.realm.waiting_period_threshold: | ||
| return True | ||
| return False | ||
|
|
||
| def can_create_streams(self) -> bool: | ||
| if self.realm.create_stream_by_admins_only: | ||
| return False |
There was a problem hiding this comment.
This part of the commit is wrong; we need to check if the user is an admin before we check this.
There was a problem hiding this comment.
@timabbott Made the required changes.
shubham-padia
force-pushed
the
subs-waiting-period
branch
from
2311da2
to
704d424
Compare
This is a preparatory refactor for adding UserProfile.can_subscribe_other_users. Although there existed a test for limiting users from creating streams at `test_subs.test_user_settings_for_adding_streams`, it did not test the logic inside can_add_streams, tests have been added to solve that issue.
shubham-padia
force-pushed
the
subs-waiting-period
branch
from
704d424
to
95d73b1
Compare
Does not let you subscribe other users if you are a guest or a waiting period user. Co-authored-by: Shubham Padia <shubhamapadia@gmail.com>
shubham-padia
force-pushed
the
subs-waiting-period
branch
from
95d73b1
to
83fc40b
Compare
|
Looks great, merged, thanks @shubham-padia! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Commit 1:
This is a preparatory refactor for adding
UserProfile.can_subscribe_other_users.
Although there existed a test for limiting users from creating
streams at
test_subs.test_user_settings_for_adding_streams,it did not test the logic inside can_add_streams, tests have
been added to solve that issue.
Commit 2:
Does not let you subscribe other users if you are a guest or a
waiting period user.