Skip to content

dev-maven to master-maven #258

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

Merged
merged 10 commits into from
Apr 21, 2023
Merged

dev-maven to master-maven #258

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d28ab2a
User ‘auto’ user handling in uninav
jmgasper Feb 9, 2023
90e38f6
Attempt to hide deleted uploads
jmgasper Feb 9, 2023
eaedd08
fix: header footer not sticky
dedywahyudi Feb 18, 2023
1c9d6a2
fix: comment out review score
dedywahyudi Mar 3, 2023
8531eb4
Merge pull request #251 from topcoder-platform/reskin-or
dedywahyudi Apr 10, 2023
b55eb7b
prevent duplicated iterative reviews
eisbilir Apr 20, 2023
7546812
Revert "Attempt to hide deleted uploads"
eisbilir Apr 20, 2023
b48980b
Merge pull request #259 from topcoder-platform/fix/iterative-review
eisbilir Apr 20, 2023
ba90e66
update error message
eisbilir Apr 20, 2023
9641142
Merge pull request #260 from topcoder-platform/fix/iterative-review
eisbilir Apr 20, 2023
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
17 changes: 9 additions & 8 deletions src/main/java/com/cronos/onlinereview/util/PhasesDetailsServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,21 +465,22 @@ private static Upload[][] getPreviousUploadsForSubmissions(HttpServletRequest re
Upload[][] pastSubmissions = null;
if (submissions.length > 0 && AuthorizationHelper.hasUserPermission(request, viewAllSubmissionsPermission)) {

// Find all deleted submissions for specified project
Submission[] allDeletedSubmissions = ActionsHelper.getProjectSubmissions(project.getId(), null, "Deleted",
true);
// Find all undeleted submissions for specified project
Submission[] allUnDeletedSubmissions = ActionsHelper.getProjectSubmissions(project.getId(), null, null,
false);

pastSubmissions = new Upload[submissions.length][];

for (int j = 0; j < pastSubmissions.length; ++j) {
List<Upload> temp = new ArrayList<Upload>();
long currentUploadOwnerId = submissions[j].getUpload().getOwner();

for (Submission deletedSubmission : allDeletedSubmissions) {
Upload deletedSubmissionUpload = deletedSubmission.getUpload();
if (deletedSubmission.getSubmissionType().getId() == submissions[j].getSubmissionType().getId()
&& deletedSubmissionUpload.getOwner() == currentUploadOwnerId) {
temp.add(deletedSubmissionUpload);
for (Submission unDeletedSubmission : allUnDeletedSubmissions) {
Upload unDeletedSubmissionUpload = unDeletedSubmission.getUpload();
if (unDeletedSubmission.getSubmissionType().getId() == submissions[j].getSubmissionType().getId()
&& unDeletedSubmission.getId() != submissions[j].getId()
&& unDeletedSubmissionUpload.getOwner() == currentUploadOwnerId) {
temp.add(unDeletedSubmissionUpload);
}
}

Expand Down
13 changes: 1 addition & 12 deletions web/includes/inc_header_reskin.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,6 @@
o=t.getElementsByTagName(e)[0];i.async=1;i.type="module";i.src=a;o.parentNode.insertBefore(i,o)
}(window,document,"script",scriptURL,"tcUniNav");

var userId = `${userId}`;
if (userId !== '-1') {
var handle = "${userHandle}";
}
var initials = handle ? handle.substr(0, 2).toUpperCase() : '';

var user = {
userId,
initials,
handle
};

var signInUrl = "https://accounts-auth0.topcoder-dev.com/?retUrl=https://software.topcoder-dev.com/review"

Expand All @@ -53,7 +42,7 @@
type: 'tool',
toolName: 'Review',
toolRoot: '/',
user: handle ? user : null,
user: 'auto',
signOut() {
window.location.replace(signOutUrl)
},
Expand Down
4 changes: 2 additions & 2 deletions web/includes/project/project_phase_reskin.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,9 +1180,9 @@
<c:choose>
<c:when test="${review.committed}">
<c:choose>
<c:when test="${isSubmitter and not group.checkpointReviewFinished}">
<%-- <c:when test="${isSubmitter and not group.checkpointReviewFinished}">
<or:text key="Pending"/>
</c:when>
</c:when> --%>
<c:when test="${isAllowedToViewCheckpointReview}">
<a href="<or:url value='/actions/ViewCheckpointReview?rid=${review.id}' />">
${orfn:displayScore(pageContext.request, review.score)}</a>
Expand Down