Project

General

Profile

« Previous | Next » 

Revision 50612

1. Added DivId class and API : special classes to be used by explore portal pages which have steps
2. Added DivHelpContent class and API
3. Added parameter 'div' (true/false) in '/community' to get communities related to some divIds
4. Added parameter 'div' (true/false) in '/community/{pid}/pages' to get pages of a community, which are related to some divIds
5. Added parameter 'before' (true/false) in '/pagehelpcontent'
6. When a community is deleted, all divIds, div contents, page contents related to this community are deleted too
7. When a page is deleted, all divIds, div contents, page contents related to this page are deleted too (page is also deleted from all communities)
8. In 'PageHelpContent' class 'before' field renamed to 'isPriorTo'
9. Bug fixes to ask community by 'pid' not 'id'

View differences:

PageController.java
1 1
package eu.dnetlib.uoaadmintools.controllers;
2 2

  
3 3
import eu.dnetlib.uoaadmintools.dao.CommunityDAO;
4
import eu.dnetlib.uoaadmintools.entities.Community;
5
import eu.dnetlib.uoaadmintools.entities.CommunityPage;
6
import eu.dnetlib.uoaadmintools.entities.Entity;
7
import eu.dnetlib.uoaadmintools.entities.Page;
4
import eu.dnetlib.uoaadmintools.entities.*;
8 5
import eu.dnetlib.uoaadmintools.dao.PageDAO;
9 6

  
10 7
import org.apache.log4j.Logger;
......
12 9
import org.springframework.beans.factory.annotation.Autowired;
13 10

  
14 11
import java.util.ArrayList;
12
import java.util.Iterator;
15 13
import java.util.List;
16 14
import java.util.Map;
17 15

  
......
26 24
    @Autowired
27 25
    private CommunityDAO communityDAO;
28 26

  
27
    @Autowired
28
    private PageHelpContentController pageHelpContentController;
29

  
30
    @Autowired
31
    private DivHelpContentController divHelpContentController;
32

  
33
    @Autowired
34
    private DivIdController divIdController;
35

  
29 36
    @RequestMapping(value = "/page", method = RequestMethod.GET)
30 37
    public List<Page> getAllPages() {
31 38
        return pageDAO.findAll();
......
83 90
        for (String id: pages) {
84 91
            pageDAO.delete(id);
85 92

  
86
            // delete pages from communities
93
            // delete divIds related to this page from all communities
94
            List<DivId> divIds = divIdController.getDivIds(null, id);
95
            for(DivId divId : divIds) {
96
                divIdController.deleteDivId(divId.getId());
97
            }
98

  
99
            // delete div contents related to this page from all communities
100
            List<DivHelpContentResponse> divHelpContentResponses = divHelpContentController.getDivHelpContents(null, id, null);
101
            for(DivHelpContentResponse divHelpContentResponse : divHelpContentResponses) {
102
                divHelpContentController.deleteDivHelpContent(divHelpContentResponse.getId());
103
            }
104

  
105
            // delete page contents related to this page from all communities
106
            List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentController.getPageHelpContents(null, id, null, null, null);
107
            for(PageHelpContentResponse pageHelpContentResponse : pageHelpContentResponses) {
108
                pageHelpContentController.deletePageHelpContent(pageHelpContentResponse.getId());
109
            }
110

  
111
            // delete page from communities
87 112
            List<Community> communities = communityDAO.findAll();
88 113
            for( Community community : communities ) {
89 114
                Map<String, Boolean> communityPages = community.getPages();

Also available in: Unified diff