Skip to content

Conversation

@ihsaan-ullah
Copy link
Collaborator

@ihsaan-ullah ihsaan-ullah commented Aug 2, 2023

@ mention of reviewers

@Didayolo

A brief description of the purpose of the changes contained in this PR.

When a submission is submitted by an organization, the leaderboard table is broken.
This is fixed now

Screenshot 2023-08-02 at 8 18 22 PM

Issues this PR resolves

Checklist

  • Code review by me
  • Hand tested by me
  • I'm proud of my work
  • Code review by reviewer
  • Hand tested by reviewer
  • CircleCi tests are passing
  • Ready to merge

@Didayolo
Copy link
Member

Didayolo commented Aug 10, 2023

How this conflict in leaderboad.tag should be resolved?

EDIT: OK I get it, I'm merging.

<<<<<<< submit_as_organization
            <td each="{ column in filtered_columns }">{ get_score(column, submission) } </td>
            <td if="{enable_detailed_results}"><a href="detailed_results/{submission.id}" target="_blank">Show detailed results</a></td>
=======
            <td if="{submission.organization !== null}"><a href="{submission.organization.url}">{ submission.organization.name }</a></td>
            <td each="{ column in filtered_columns }">
                <a if="{column.title == 'Detailed Results'}" href="detailed_results/{get_detailed_result_submisison_id(column, submission)}" target="_blank" class="eye-icon-link">
                    <i class="icon grey eye eye-icon"></i>
                </a>
                <span if="{column.title != 'Detailed Results'}" class="{bold_class(column, submission)}">{get_score(column, submission)}</span>
            </td>
>>>>>>> develop

@Didayolo Didayolo merged commit bf85cc3 into develop Aug 10, 2023
@Didayolo Didayolo deleted the submit_as_organization branch August 10, 2023 15:27
@Didayolo Didayolo mentioned this pull request Aug 10, 2023
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants