Revision 58395
Added by Konstantina Galouni about 4 years ago
| PageHelpContentService.java | ||
|---|---|---|
| 26 | 26 |
@Autowired |
| 27 | 27 |
private PortalService portalService; |
| 28 | 28 |
|
| 29 |
public List<PageHelpContentResponse> getPageHelpContents(String pid, String page, String position, String active, String before) {
|
|
| 29 |
public List<PageHelpContentResponse> getPageHelpContents(String pid, String portalType, String page, String position, String active, String before) {
|
|
| 30 | 30 |
List<PageHelpContent> pageHelpContents = null; |
| 31 | 31 |
|
| 32 | 32 |
Portal _portal = null; |
| ... | ... | |
| 75 | 75 |
List<PageHelpContentResponse> pageHelpContentResponses = new ArrayList<>(); |
| 76 | 76 |
for (PageHelpContent pageHelpContent : pageHelpContents) {
|
| 77 | 77 |
Page _page = pageService.getPage(pageHelpContent.getPage()); |
| 78 |
if(page == null || page.equals(_page.getRoute())) {
|
|
| 78 |
if((page == null || page.equals(_page.getRoute())) && (portalType == null || portalType.equals(_page.getPortalType()))) {
|
|
| 79 | 79 |
PageHelpContentResponse pageHelpContentResponse = new PageHelpContentResponse(pageHelpContent); |
| 80 | 80 |
|
| 81 | 81 |
pageHelpContentResponse.setPage(_page); |
| ... | ... | |
| 125 | 125 |
return true; |
| 126 | 126 |
} |
| 127 | 127 |
|
| 128 |
public void addPageHelpContentsInPortal(String pid, String portalId) {
|
|
| 129 |
if (pid != "connect" && pid != "openaire") {
|
|
| 128 |
public void addPageHelpContentsInPortal(String portalId, String portalType) {
|
|
| 129 |
Page organizationsPage = pageService.getPageByPortalTypeAndRoute(portalType, "/organizations"); |
|
| 130 |
if(organizationsPage != null) {
|
|
| 130 | 131 |
String organizations_page_content = "<div> <p>Here you can write more details about the organizations related to your community.</p> </div>"; |
| 131 |
Page organizationsPage = (pageService.getAllPages(null, "/organizations", null)).get(0); |
|
| 132 | 132 |
|
| 133 |
PageHelpContent organizations_pageHelpContent = new PageHelpContent(organizationsPage.getId(), pid, "top", 1, organizations_page_content, false, false);
|
|
| 133 |
PageHelpContent organizations_pageHelpContent = new PageHelpContent(organizationsPage.getId(), portalId, "top", 1, organizations_page_content, false, false);
|
|
| 134 | 134 |
this.insertPageHelpContent(organizations_pageHelpContent); |
| 135 |
} |
|
| 135 | 136 |
|
| 137 |
Page depositLearnHowPage = pageService.getPageByPortalTypeAndRoute(portalType, "/participate/deposit/learn-how"); |
|
| 138 |
if(depositLearnHowPage != null) {
|
|
| 136 | 139 |
String depositLearnHow_page_content = "" + |
| 137 | 140 |
"<div class=\"uk-width-3-5 uk-align-center\"> " + |
| 138 | 141 |
" <div class=\"uk-text-bold\">How to comply with funder Open Access policies</div> " + |
| ... | ... | |
| 143 | 146 |
" <li>All OpenAIRE guides can be found <a class=\"custom-external\" href=\"https://www.openaire.eu/guides\" target=\"_blank\">here</a></li> " + |
| 144 | 147 |
" </ul> " + |
| 145 | 148 |
"</div>"; |
| 146 |
Page depositLearnHowPage = (pageService.getAllPages(null, "/participate/deposit/learn-how", null)).get(0); |
|
| 147 | 149 |
|
| 148 |
PageHelpContent depositLearnHow_pageHelpContent = new PageHelpContent(depositLearnHowPage.getId(), pid, "bottom", 1, depositLearnHow_page_content, true, false);
|
|
| 150 |
PageHelpContent depositLearnHow_pageHelpContent = new PageHelpContent(depositLearnHowPage.getId(), portalId, "bottom", 1, depositLearnHow_page_content, true, false);
|
|
| 149 | 151 |
this.insertPageHelpContent(depositLearnHow_pageHelpContent); |
| 150 | 152 |
} |
| 151 | 153 |
} |
Also available in: Unified diff
[Trunk | Admin Tools Library Service]:
1. DivHelpContentController.java: In "getDivHelpContents()" (/divhelpcontent) method rename parameter "div" to "divId" | Delete unnecessary method "addDivHelpContentsInPortal()".
2. PageHelpContentController.java: In "getPageHelpContents()" (/pagehelpconent) method add request parameter "portalType".
3. PortalController.java: Controller added for common methods of "ExploreController", "ConnectController" and "CommunityController" in "Admin Tools Service" - @RequestMapping with multiple paths.
4. DivIdDAO.java & MongoDBDivIdDAO.java:
a. Method "findByName()" returns List with new schema.
b. Added methods: "List<DivId> findByPagesContainingAndPortalType()", "DivId findByPagesContainingAndNameAndPortalType()", "DivId findByNameAndPortalType()".
5. PortalDAO.java & MongoDBPortalDAO.java: Added method "findByType()".
6. Portal.java & PortalResponse.java: Removed "layout" field and its methods.
7. DivHelpContentService.java:
a. In "getDivHelpContents()" (/divhelpcontent) method rename parameter "div" to "divId"
b. public void addDivHelpContentsInPortal(String pid, String portalId, String divIdName) --> public void addDivHelpContentsInPortal(String portalId, String portalType)
8. DivIdService.java:
a. [Bug fix] "getDivIds()", "getDivIdsFull()", "deleteDivIds()", "getDivIdsPages()" methods
b. Added method "getDivIdsByPortalType()"
c. Commented "getDivIdByName()" method.
9. PageHelpContentService.java:
a. In "getPageHelpContents()" method add parameter "portalType" and do bug fixes.
b. public void addPageHelpContentsInPortal(String pid, String portalId) --> public void addPageHelpContentsInPortal(String portalId, String portalType).
10. PageService.java:
a. [Bug fix] "getPagesFull()", "getAllPages()", "deletePageHelpContentsForPositionsIfDisabled()" methods.
b. Added methods "getPagesByPortalType()" and "getPageByPortalTypeAndRoute()".
11. PortalService.java:
a. [Bug fix] "getPortalFull()".
b. Method "deletePortal()" renamed to "deletePortalId()" and added NEW "deletePortal()" which deletes related page and div contents (and if no portal with the same type, also pages and divIds).