feat: Allow users to comment #193
Merged
Conversation
This file contains hidden or 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
Collaborator
orronai
commented
Sep 29, 2020
orronai
commented
- Users can now comment to their own solutions
- Users can now delete their own comments
- Users can now comment to their own solutions - Users can now delete their own comments
- Changed the style of users comments to different color
yammesicka
requested changes
Sep 29, 2020
- Fixed common comments to be only staff comments
yammesicka
requested changes
Sep 29, 2020
- Added in the configurations a variable that the admin can turn on and off this feature - Changed the common comments according to peewee documentation
- Added checks in the backend to distinguish whether a user has permissions to comment - Added a check in the grader.js javascript file to check if the user can see the trash icon to delete a comment - Added unittest for checking users comments
yammesicka
requested changes
Sep 30, 2020
| and not current_user.role.is_manager | ||
| ): | ||
| return fail(403, "You aren't allowed to access this page.") | ||
|
|
||
| if act == 'delete': | ||
| comment_id = int(request.args.get('commentId')) | ||
| comment_ = Comment.get_or_none(Comment.id == comment_id) |
There was a problem hiding this comment.
A user should be able to delete a comment only if its his comment , or he's an administrator
lms/lmsweb/views.py
Outdated
| CommentText.select(CommentText.id, CommentText.text).join(Comment) | ||
| .join(User).join(Role).where( | ||
| CommentText.flake8_key.is_null(True), | ||
| Comment.commenter.role > Role.get_student_role().id, |
There was a problem hiding this comment.
role doesn't have total ordering, and we don't wanna take the comments of banned users.
Check if role == administrator or role == staff
- Fixed a test of users trying to delete a staff user's comment - Fixed that users can't remove staff comments
- Fixed a test of users trying to delete a staff user's comment - Fixed that users can't remove staff comments # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # On branch allow-users-comments # Changes to be committed: # modified: lms/lmsdb/models.py # modified: lms/lmsweb/views.py # modified: lms/tests/conftest.py # modified: lms/tests/test_solutions.py #
yammesicka
approved these changes
Oct 3, 2020
| CommentText.flake8_key.name: None, | ||
| }).select(CommentText.id, CommentText.text).join(Comment) | ||
| is_moderator_comments = ( | ||
| (Comment.commenter.role == Role.get_staff_role().id) |
There was a problem hiding this comment.
Comment.commenter.role.is_staff?
There was a problem hiding this comment.
It's not possible - it throws an error that says is_staff, is_manager etc. are not attributes of Role.
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.