Revision 59449
Added by Konstantina Galouni over 3 years ago
PageService.java | ||
---|---|---|
219 | 219 |
public Boolean deletePages(List<String> pages) throws Exception { |
220 | 220 |
for (String id: pages) { |
221 | 221 |
Page page = pageDAO.findById(id); |
222 |
pageDAO.delete(id); |
|
223 | 222 |
|
224 | 223 |
// delete divIds related only to this page from all portals, otherwise remove this page from divIds |
225 | 224 |
List<DivId> divIds = divIdService.getDivIds(id, null, null); |
226 | 225 |
for(DivId divId : divIds) { |
227 | 226 |
if(divId.getPages().size() == 1) { |
228 |
divIdService.deleteDivId(divId.getId()); |
|
229 |
|
|
230 | 227 |
// delete div contents related to this page from all portals |
231 |
List<DivHelpContentResponse> divHelpContentResponses = divHelpContentService.getDivHelpContents(null, id, divId.getId(), null);
|
|
228 |
List<DivHelpContentResponse> divHelpContentResponses = divHelpContentService.getDivHelpContents(null, page.getRoute(), divId.getId(), null);
|
|
232 | 229 |
for (DivHelpContentResponse divHelpContentResponse : divHelpContentResponses) { |
233 | 230 |
divHelpContentService.deleteDivHelpContent(divHelpContentResponse.getId()); |
234 | 231 |
} |
232 |
divIdService.deleteDivId(divId.getId()); |
|
233 |
|
|
235 | 234 |
} else { |
236 | 235 |
List<String> divIdPages = divId.getPages(); |
237 | 236 |
divIdPages.remove(id); |
... | ... | |
242 | 241 |
|
243 | 242 |
|
244 | 243 |
// delete page contents related to this page from all portals |
245 |
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, page.getPortalType(), id, null, null, null); |
|
244 |
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, page.getPortalType(), page.getRoute(), null, null, null); |
|
245 |
|
|
246 | 246 |
for(PageHelpContentResponse pageHelpContentResponse : pageHelpContentResponses) { |
247 | 247 |
pageHelpContentService.deletePageHelpContent(pageHelpContentResponse.getId()); |
248 | 248 |
} |
... | ... | |
255 | 255 |
portal.setPages(portalPages); |
256 | 256 |
portalService.insertOrUpdatePortal(portal); |
257 | 257 |
} |
258 |
|
|
259 |
pageDAO.delete(id); |
|
258 | 260 |
} |
259 | 261 |
|
260 | 262 |
return true; |
Also available in: Unified diff
[Trunk | Admin Tools Library]:
1. AdminPortalRelationsController.java: In "getDivIdsFull()" (/{pid}/div/full) set RequestParam page as NOT required (bug fix in admin portal).
2. EntityService.java: [Bug fix]
a. In "deleteEntities()", delete entity, after all relations with it have been deleted.
b. Check equality of page entity with id with "equals" not "==".
3. PageService.java: [Bug fix]
a. Delete page, after all related divIds, related div help contents, related page help contents have been deleted.
b. Delete divId, after all related div help contents have been deleted.
c. In "getDivHelpContents()" and "getPageHelpContents()" param is "page.getRoute()" (not its id).