Revision 56174
Added by Konstantina Galouni almost 5 years ago
| CommunityController.java | ||
|---|---|---|
| 385 | 385 |
|
| 386 | 386 |
Page p = pageDAO.findById(page.getKey()); |
| 387 | 387 |
|
| 388 |
if((pid.equals("openaire") && p.getOpenaire()) ||(!pid.equals("openaire") && p.getConnect())) {
|
|
| 388 |
if((pid.equals("openaire") && p.getOpenaire()) || (pid.equals("connect") && p.getConnect()) ||(!pid.equals("openaire") && !pid.equals("connect") && p.getCommunities())) {
|
|
| 389 | 389 |
if ((page_type == null && page_route == null) || (page_route == null && p.getType().equals(page_type)) |
| 390 | 390 |
|| p.getRoute().equals(page_route)) {
|
| 391 | 391 |
CommunityPage communityPage = new CommunityPage(p); |
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.