-
Notifications
You must be signed in to change notification settings - Fork 165
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.
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
Activity list page allows staff and educators to see unpublished activities #1114
base: master
Are you sure you want to change the base?
Conversation
pre-commit checks failed ❌❌❌ |
1 similar comment
pre-commit checks failed ❌❌❌ |
const commonClasses = makeStyles(DefaultStyles)(); | ||
const { t } = useTranslation(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@brrkrmn can you check if we have t
as part of the props
passed to Activities
? If we don't then something Is wrong and we should fix that (but not on this PR probably). However if t
is in props
then we should use it and not bother importing it again
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we have it in the props, changing the file now
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think there are other PRs where you made translation changes to. For can check for this in those too
pre-commit checks failed ❌❌❌ |
@brrkrmn I think merging master into your commit is causing the pre-commit action to try running for changes that are not introduced by this PR (and failing). while this is undesirable and should be fixed by me, something we can do is squash the three commits in this PR (the two commits introduced by you and the merge commit) into just one commit and force push |
If you don't know how to squash commits I can do that but then you'd have to do some kind of force-pull or delete and recreate the branch from the PR |
just squashing will likely not work here. Let me look at it and recommend exactly how to do it |
c380b75
to
29b6a87
Compare
pre-commit checks failed ❌❌❌ |
I rebased on master alternatively, you can look at the failing pre-commit errors here |
29b6a87
to
5d0c723
Compare
pre-commit checks failed ❌❌❌ |
5d0c723
to
2b81fef
Compare
All pre-commit checks passed ✅✅✅ |
* fix creator profile margin * fix projects section margin * fix wider project css issues * fix eslint issues Closes #1005 Signed-off-by: Ndibe Raymond Olisaemeka <[email protected]> Co-authored-by: Ndibe Raymond Olisaemeka <[email protected]>
* create views and utils methods to recommend projects * create api function to receive recommended projects in the frontend * modify project filtering * refactor recommend projects function Issue: #1013 Signed-off-by: Ndibe Raymond Olisaemeka <[email protected]> Co-authored-by: Ndibe Raymond Olisaemeka <[email protected]>
* style page and add login card * fix misaligned login form in search results * change styles for creator search * implement no results found design * make results one row * made some major refactors Issue: #802 Signed-off-by: Ndibe Raymond Olisaemeka <[email protected]> Co-authored-by: Ndibe Raymond Olisaemeka <[email protected]>
* minor modifications to the admin model * add admin models management to admin.py * implement effective signals to handle admin models instances, addition, modification and deletion with proper cleanup Issue: #1094 Signed-off-by: Ndibe Raymond Olisaemeka <[email protected]> Co-authored-by: Ndibe Raymond Olisaemeka <[email protected]>
2b81fef
to
407b49c
Compare
@tuxology this has been rebased so we can focus on testing before merging to staging |
All pre-commit checks passed ✅✅✅ |
Summary
With this PR, in the activity list page:
Closes #1100
Changes
getUnPublishedActivities
are stored inunPublishedActivities
instead of 'all_activities'Screenshots
Creator view
Educator view
Staff view