Revision 56174
Added by Konstantina Galouni almost 5 years ago
| PageController.java | ||
|---|---|---|
| 38 | 38 |
public List<Page> getAllPages(@RequestParam(required=false) String pid) {
|
| 39 | 39 |
List<Page> pages; |
| 40 | 40 |
if(pid !=null){
|
| 41 |
pages = (pid=="openaire")? pageDAO.findByOpenaire(true):pageDAO.findByConnect(true); |
|
| 41 |
if(pid=="openaire") {
|
|
| 42 |
pages = pageDAO.findByOpenaire(true); |
|
| 43 |
} else if(pid == "connect") {
|
|
| 44 |
pages = pageDAO.findByConnect(true); |
|
| 45 |
} else {
|
|
| 46 |
pages = pageDAO.findByCommunities(true); |
|
| 47 |
} |
|
| 42 | 48 |
} |
| 43 | 49 |
else{
|
| 44 | 50 |
pages = pageDAO.findAll(); |
| ... | ... | |
| 84 | 90 |
page.setName(communityPage.getName()); |
| 85 | 91 |
page.setType(communityPage.getType()); |
| 86 | 92 |
page.setConnect(communityPage.getConnect()); |
| 93 |
page.setCommunities(communityPage.getCommunities()); |
|
| 87 | 94 |
page.setOpenaire(communityPage.getOpenaire()); |
| 88 | 95 |
|
| 89 | 96 |
List<Entity> fullEntities = communityPage.getEntities(); |
Also available in: Unified diff
1. CommunityController.java: Add check for pid: "connect"
2. DivIdController.java: Bug fix: Save and Update methods should get parameter DivIdResponse
3. PageController.java: pid == "connect" case - get pages that are enabled in connect
4. CommunityPage.java & Page.java & PageDAO.java & MongoDBPageDAO.java: Rename "connect" field to "communities" and use "connect" field for connect general pages (not community specific)
5. update_db.js: Add function to set "communities" field in each page with value from "connect" field, and make "connect" false.