Skip to content

Commit 7737421

Browse files
dedywahyudidedywahyudi
authored
Merge pull request #227 from topcoder-platform/dev-maven
2 parents 75a5496 + db6466f commit 7737421

File tree

74 files changed

+11206
-3911
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+11206
-3911
lines changed

‎.circleci/config.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ install_dependency: &install_dependency
3131
install_deploysuite: &install_deploysuite
3232
name: Installation of install_deploysuite.
3333
command: |
34-
git clone --branch v1.4.8 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
34+
git clone --branch v1.4.14 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
3535
cp ./../buildscript/master_deploy.sh .
3636
cp ./../buildscript/buildenv.sh .
3737
cp ./../buildscript/awsconfiguration.sh .
@@ -190,7 +190,8 @@ workflows:
190190
filters:
191191
branches:
192192
only:
193-
- dev-maven
193+
- reskin-or
194+
- ci-fix-test
194195

195196
- deployProd:
196197
context : org-global

‎src/main/java/com/cronos/onlinereview/actions/projectlinks/EditProjectLinksAction.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55

66
import com.cronos.onlinereview.Constants;
77
import com.cronos.onlinereview.actions.DynamicModelDrivenAction;
8+
import com.cronos.onlinereview.util.AuthorizationHelper;
89
import com.cronos.onlinereview.model.DynamicModel;
910
import com.cronos.onlinereview.util.ActionsHelper;
1011
import com.cronos.onlinereview.util.Comparators;
12+
import com.cronos.onlinereview.util.ConfigHelper;
1113
import com.cronos.onlinereview.util.CorrectnessCheckResult;
1214
import com.cronos.onlinereview.util.LoggingHelper;
1315
import com.topcoder.onlinereview.component.exception.BaseException;
@@ -69,6 +71,25 @@ public String execute() throws BaseException {
6971
}
7072

7173
Project project = verification.getProject();
74+
request.setAttribute("projectStatus", project.getProjectStatus().getName());
75+
76+
final String projectTypeName = project.getProjectCategory().getProjectType().getName();
77+
78+
boolean hasForumType = project.getAllProperties().containsKey("Forum Type");
79+
80+
long projectId = project.getId();
81+
long forumId = -1;
82+
String tempStr;
83+
84+
tempStr = (String) project.getProperty("Developer Forum ID");
85+
if (tempStr != null && tempStr.trim().length() != 0) {
86+
forumId = Long.parseLong(tempStr, 10);
87+
}
88+
89+
request.setAttribute("viewContestLink", ConfigHelper.getProjectTypeViewContestLink(projectTypeName, projectId));
90+
91+
request.setAttribute("forumLink", ConfigHelper.getProjectTypeForumLink(
92+
(projectTypeName.equalsIgnoreCase("studio") && hasForumType) ? "NewStudio" : projectTypeName, forumId));
7293

7394
// obtains the project link manager
7495
ProjectLinkManager linkManager = ActionsHelper.createProjectLinkManager();
@@ -92,6 +113,8 @@ public String execute() throws BaseException {
92113

93114
// set up projects except for deleted ones
94115
request.setAttribute("allProjects", allProjects);
116+
request.setAttribute("isAllowedToContactPM",
117+
AuthorizationHelper.hasUserPermission(request, Constants.CONTACT_PM_PERM_NAME));
95118

96119
// Populate the form with project and project link properties
97120
populateProjectLinkForm(getModel(), verification.getProject());

‎src/main/java/com/cronos/onlinereview/actions/projectmanagementconsole/ViewManagementConsoleAction.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.cronos.onlinereview.util.AuthorizationHelper;
1010
import com.cronos.onlinereview.util.CorrectnessCheckResult;
1111
import com.cronos.onlinereview.util.LoggingHelper;
12+
import com.cronos.onlinereview.util.ConfigHelper;
1213
import com.topcoder.onlinereview.component.project.management.Project;
1314
import com.topcoder.onlinereview.component.exception.BaseException;
1415

@@ -64,6 +65,28 @@ public String execute() throws BaseException {
6465
Project project = verification.getProject();
6566
initProjectManagementConsole(request, project);
6667

68+
request.setAttribute("projectStatus", project.getProjectStatus().getName());
69+
70+
final String projectTypeName = project.getProjectCategory().getProjectType().getName();
71+
72+
boolean hasForumType = project.getAllProperties().containsKey("Forum Type");
73+
74+
long projectId = project.getId();
75+
long forumId = -1;
76+
String tempStr;
77+
78+
tempStr = (String) project.getProperty("Developer Forum ID");
79+
if (tempStr != null && tempStr.trim().length() != 0) {
80+
forumId = Long.parseLong(tempStr, 10);
81+
}
82+
83+
request.setAttribute("viewContestLink", ConfigHelper.getProjectTypeViewContestLink(projectTypeName, projectId));
84+
85+
request.setAttribute("forumLink", ConfigHelper.getProjectTypeForumLink(
86+
(projectTypeName.equalsIgnoreCase("studio") && hasForumType) ? "NewStudio" : projectTypeName, forumId));
87+
request.setAttribute("isAllowedToContactPM",
88+
AuthorizationHelper.hasUserPermission(request, Constants.CONTACT_PM_PERM_NAME));
89+
6790
return Constants.SUCCESS_FORWARD_NAME;
6891
}
6992
}

‎src/main/java/com/cronos/onlinereview/actions/projectpayments/EditProjectPaymentsAction.java

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
import com.cronos.onlinereview.Constants;
99
import com.cronos.onlinereview.util.ActionsHelper;
1010
import com.cronos.onlinereview.util.AuthorizationHelper;
11+
import com.cronos.onlinereview.util.ConfigHelper;
1112
import com.cronos.onlinereview.util.CorrectnessCheckResult;
1213
import com.cronos.onlinereview.util.LoggingHelper;
14+
import com.topcoder.onlinereview.component.project.management.Project;
1315
import com.topcoder.onlinereview.component.project.payment.ProjectPayment;
1416
import com.topcoder.onlinereview.component.project.payment.ProjectPaymentManager;
1517
import com.topcoder.onlinereview.component.project.payment.ProjectPaymentFilterBuilder;
@@ -64,7 +66,30 @@ public String execute() throws BaseException {
6466
// At this point, redirect-after-login attribute should be removed (if it exists)
6567
AuthorizationHelper.removeLoginRedirect(request);
6668

67-
long projectId = verification.getProject().getId();
69+
Project project = verification.getProject();
70+
71+
request.setAttribute("projectStatus", project.getProjectStatus().getName());
72+
73+
final String projectTypeName = project.getProjectCategory().getProjectType().getName();
74+
75+
boolean hasForumType = project.getAllProperties().containsKey("Forum Type");
76+
77+
long projectId = project.getId();
78+
long forumId = -1;
79+
String tempStr;
80+
81+
tempStr = (String) project.getProperty("Developer Forum ID");
82+
if (tempStr != null && tempStr.trim().length() != 0) {
83+
forumId = Long.parseLong(tempStr, 10);
84+
}
85+
86+
request.setAttribute("viewContestLink", ConfigHelper.getProjectTypeViewContestLink(projectTypeName, projectId));
87+
88+
request.setAttribute("forumLink", ConfigHelper.getProjectTypeForumLink(
89+
(projectTypeName.equalsIgnoreCase("studio") && hasForumType) ? "NewStudio" : projectTypeName, forumId));
90+
request.setAttribute("isAllowedToContactPM",
91+
AuthorizationHelper.hasUserPermission(request, Constants.CONTACT_PM_PERM_NAME));
92+
6893
ProjectPaymentManager projectPaymentManager = ActionsHelper.createProjectPaymentManager();
6994
List<ProjectPayment> payments = projectPaymentManager.search(
7095
ProjectPaymentFilterBuilder.createProjectIdFilter(projectId));

‎src/main/java/com/cronos/onlinereview/actions/projectpayments/ViewProjectPaymentsAction.java

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.cronos.onlinereview.util.ConfigHelper;
1414
import com.cronos.onlinereview.util.CorrectnessCheckResult;
1515
import com.cronos.onlinereview.util.LoggingHelper;
16+
import com.topcoder.onlinereview.component.project.management.Project;
1617
import com.topcoder.onlinereview.component.project.payment.ProjectPayment;
1718
import com.topcoder.onlinereview.component.project.payment.ProjectPaymentManager;
1819
import com.topcoder.onlinereview.component.project.payment.ProjectPaymentFilterBuilder;
@@ -65,7 +66,27 @@ public String execute() throws BaseException {
6566
// At this point, redirect-after-login attribute should be removed (if it exists)
6667
AuthorizationHelper.removeLoginRedirect(request);
6768

68-
long projectId = verification.getProject().getId();
69+
Project project = verification.getProject();
70+
71+
request.setAttribute("projectStatus", project.getProjectStatus().getName());
72+
73+
final String projectTypeName = project.getProjectCategory().getProjectType().getName();
74+
75+
boolean hasForumType = project.getAllProperties().containsKey("Forum Type");
76+
77+
long projectId = project.getId();
78+
long forumId = -1;
79+
String tempStr;
80+
81+
tempStr = (String) project.getProperty("Developer Forum ID");
82+
if (tempStr != null && tempStr.trim().length() != 0) {
83+
forumId = Long.parseLong(tempStr, 10);
84+
}
85+
86+
request.setAttribute("viewContestLink", ConfigHelper.getProjectTypeViewContestLink(projectTypeName, projectId));
87+
88+
request.setAttribute("forumLink", ConfigHelper.getProjectTypeForumLink(
89+
(projectTypeName.equalsIgnoreCase("studio") && hasForumType) ? "NewStudio" : projectTypeName, forumId));
6990
ProjectPaymentManager projectPaymentManager = ActionsHelper.createProjectPaymentManager();
7091
List<ProjectPayment> payments = projectPaymentManager.search(
7192
ProjectPaymentFilterBuilder.createProjectIdFilter(projectId));
@@ -74,6 +95,8 @@ public String execute() throws BaseException {
7495
Resource[] resources = ActionsHelper.getAllResourcesForProject(verification.getProject());
7596
populateResourcesMap(request, resources);
7697
request.setAttribute("payments", payments);
98+
request.setAttribute("isAllowedToContactPM",
99+
AuthorizationHelper.hasUserPermission(request, Constants.CONTACT_PM_PERM_NAME));
77100
request.setAttribute("isAllowedToEditPayments",
78101
AuthorizationHelper.hasUserPermission(request, Constants.EDIT_PAYMENTS_PERM_NAME));
79102
request.setAttribute("pactsPaymentDetailBaseURL", ConfigHelper.getPactsPaymentDetailBaseURL());

‎src/main/java/com/cronos/onlinereview/mockups/MockHandleTag.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,9 @@ public int doEndTag() throws JspException {
185185
textColor = "coderTextOrange";
186186
}
187187

188+
188189
// Start preparing resulting output
189-
StringBuilder results = new StringBuilder("<a href=\"http://www.topcoder.com/tc?module=MemberProfile&cr=");
190+
StringBuilder results = new StringBuilder("<a href=\"http://<%=ApplicationServer.SERVER_NAME%>/tc?module=MemberProfile&cr=");
190191
// appending coder's id to the generated link
191192
results.append(coderId);
192193
// tab will be specified only if tab local variable is not empty

‎src/main/java/com/cronos/onlinereview/util/AuthorizationHelper.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,9 @@ public static void gatherUserRoles(HttpServletRequest request) throws BaseExcept
219219
ExternalUser extUser = usrMgr.retrieveUser(getLoggedInUserId(request));
220220
// Place handle of the user into session as attribute
221221
request.getSession().setAttribute("userHandle", extUser.getHandle());
222+
request.getSession().setAttribute("userFirstName", extUser.getFirstName());
223+
request.getSession().setAttribute("userLastName", extUser.getLastName());
224+
request.getSession().setAttribute("userEmail", extUser.getEmail());
222225
}
223226

224227
// Perform search for resources
@@ -478,7 +481,7 @@ private static AuthorizationService retrieveAuthorizationService(HttpServletRequ
478481
* Sets the sso cookie service to be used for authenticating users based on
479482
* cookie.
480483
* </p>
481-
*
484+
*
482485
* @param ssoCookieService the ssoCookieService to set
483486
*/
484487
public void setSsoCookieService(SSOCookieService ssoCookieService) {
@@ -489,7 +492,7 @@ public void setSsoCookieService(SSOCookieService ssoCookieService) {
489492
* <p>
490493
* Validate jwt token
491494
* </p>
492-
*
495+
*
493496
* @param token the jwt token
494497
* @throws JWTException if any error occurs
495498
* @return the DecodedJWT result

‎src/main/java/com/cronos/onlinereview/util/ConfigHelper.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,11 @@ public class ConfigHelper {
593593
*/
594594
private static final String CHALLENGE_BY_LEGACY_ID_URL_V5 = "challenge_by_legacy_id_url_v5";
595595

596+
/**
597+
* <p>A <code>String</code> providing support requests v5 url property.</p>
598+
*/
599+
private static final String SUPPORT_REQUEST_URL_V5 = "support_request_url_v5";
600+
596601
/**
597602
* This member variable holds the submitter role id.
598603
*/
@@ -1069,6 +1074,11 @@ public class ConfigHelper {
10691074
*/
10701075
private static String challengeByLegacyIdUrlV5;
10711076

1077+
/**
1078+
* Support Request URL
1079+
*/
1080+
private static String supportRequestUrlV5;
1081+
10721082
static {
10731083
// Obtaining the instance of Configuration Manager
10741084
ConfigManager cfgMgr = new ConfigManager();
@@ -1696,6 +1706,8 @@ public class ConfigHelper {
16961706
newAuthUrl = newAuth.getValue("new_auth_url");
16971707

16981708
challengeByLegacyIdUrlV5 = cfgMgr.getString(ONLINE_REVIEW_CFG_NS, CHALLENGE_BY_LEGACY_ID_URL_V5);
1709+
1710+
supportRequestUrlV5 = cfgMgr.getString(ONLINE_REVIEW_CFG_NS, SUPPORT_REQUEST_URL_V5);
16991711
} catch (Exception une) {
17001712
System.out.println(une.getMessage());
17011713
une.printStackTrace();
@@ -2586,4 +2598,12 @@ public static String getNewAuthUrl() {
25862598
public static String getChallengeByLegacyIdUrlV5() {
25872599
return challengeByLegacyIdUrlV5;
25882600
}
2601+
2602+
/**
2603+
* Get support request url
2604+
* @return url
2605+
*/
2606+
public static String getSupportRequestUrlV5() {
2607+
return supportRequestUrlV5;
2608+
}
25892609
}

0 commit comments

Comments
 (0)