Skip to content

Refactor card details link in partial_card.html #708

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

Open
kingraphaii wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Refactor card details link in partial_card.html #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c07b079
Refactor card details link in partial_card.html
kingraphaii Mar 11, 2024
c24789b
fix invalid emails
kingraphaii Mar 11, 2024
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
7 changes: 2 additions & 5 deletions backend/frontend/templates/frontend/user/board/partial_card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,9 @@ <h5 class="w-[auto] h-[auto] text-black text-base font-bold font-'Poppins' leadi
hx-swap="outerHTML">Cancel review request</button>
{% endif %}
</div>

<div class="grid grid-cols-2 grid-auto-rows-1fr gap-x-10 gap-y-10 w-full h-[auto]">
<div class="col-span-1 row-span-1 w-full">
{%if card.content_item.content_type_nice == "project" and card.content_item.project_submission_type_nice == "link" %}
Copy link
Collaborator

@sheenarbw sheenarbw Mar 13, 2024

Choose a reason for hiding this comment

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

This will need to be fixed again as soon as the topic details page is in place.

Why not rather fix it in a perminant way?

You can make placeholder views for the different types of content and then the link can go there. And then the actual pages can get implemented later.

If you fix something in a way that means you need to fix it again later, is it really fixed? Let's steer clear of duct-tape

<a href="{% url 'course_component_details' card.recruit_project.id %}" class="{{ styles.button_primary_small }}">Details</a>
</div>
</div>
{% endif %}
</div>
</div>
<div class="hidden group-hover:block top-7 right-[2] mt-2 p-2 bg-white border absolute rounded">
Expand Down
12 changes: 6 additions & 6 deletions backend/frontend/tests/test_restricted_user_board_access.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ def setUp(self):

self.viewed_user_team = TeamFactory()
self.viewed_user = UserFactory(
email="learner.umuzi.org",
email="learner@umuzi.org",
)
self.viewed_user.set_password(self.viewed_user.email)
self.viewed_user.save()
self.viewed_user_team.user_set.add(self.viewed_user)

self.user_without_access = UserFactory(
email="user_without_access.umuzi.org",
email="user_without_access@umuzi.org",
)
self.user_without_access.set_password(self.user_without_access.email)
self.user_without_access.save()
Expand All @@ -39,7 +39,7 @@ def _setup_users_who_can_view_user_board(self):

def _setup_user_with_manage_card_permission(self):
self.user_with_manage_card_permission = UserFactory(
email="user_with_manage_card_permission.umuzi.org"
email="user_with_manage_card_permission@umuzi.org"
)
self.user_with_manage_card_permission.set_password(
self.user_with_manage_card_permission.email
Expand All @@ -53,7 +53,7 @@ def _setup_user_with_manage_card_permission(self):

def _setup_user_with_view_permission(self):
self.user_with_view_permission = UserFactory(
email="user_with_view_permission.umuzi.org"
email="user_with_view_permission@umuzi.org"
)
self.user_with_view_permission.set_password(
self.user_with_view_permission.email
Expand All @@ -67,7 +67,7 @@ def _setup_user_with_view_permission(self):

def _setup_user_with_review_cards_permission(self):
self.user_with_review_cards_permission = UserFactory(
email="user_with_review_cards_permission.umuzi.org"
email="user_with_review_cards_permission@umuzi.org"
)
self.user_with_review_cards_permission.set_password(
self.user_with_review_cards_permission.email
Expand All @@ -80,7 +80,7 @@ def _setup_user_with_review_cards_permission(self):
)

def _setup_trusted_user(self):
self.trusted_reviewer = UserFactory(email="trusted_reviewer.umuzi.org")
self.trusted_reviewer = UserFactory(email="trusted_reviewer@umuzi.org")
self.trusted_reviewer.set_password(self.trusted_reviewer.email)
self.trusted_reviewer.save()
assign_perm(
Expand Down