Mercurial > hg > LGServices
diff src/main/java/de/mpiwg/web/jsp/JSPProxy.java @ 42:815cd86bb9ec
bug fixed: some NullPointer situations caused by null topicId
author | Zoe Hong <zhong@mpiwg-berlin.mpg.de> |
---|---|
date | Fri, 18 Dec 2015 11:50:24 +0100 |
parents | ba9515f22897 |
children | 9dbbbfd474f4 |
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/web/jsp/JSPProxy.java Thu Dec 17 13:44:08 2015 +0100 +++ b/src/main/java/de/mpiwg/web/jsp/JSPProxy.java Fri Dec 18 11:50:24 2015 +0100 @@ -312,29 +312,35 @@ if(StringUtils.equals(action, "forceLoadTopicSectionRelation")){ getSessionBean().getTopicPage().forceLoadTopicSectionRelation(); - - } else /* if(StringUtils.equals(action, "deleteTopic")){ - getSessionBean().getTopicPage().deleteTopic(); - } else if(StringUtils.equals(action, "createTopic")){ - Long userId = getSessionBean().getUser().getId(); - getSessionBean().getTopicPage().createTopic(userId); - - } else */ - - if(StringUtils.equals(action, "addContributor")){ - getSessionBean().getTopicPage().addContributor(); - } else if(StringUtils.equals(action, "removeContributor")){ - getSessionBean().getTopicPage().removeContributor(); - } else if( StringUtils.equals(action ,"updateDescription")) { - getSessionBean().getTopicPage().updateDescription(); - - } else if( StringUtils.equals(action ,"deleteSection")) { - getSessionBean().getTopicPage().deleteSection(getLongParameter("sectionId")); } else if(StringUtils.equals(action, "filter")){ getSessionBean().getTopicPage().filter(); - + + } else + /* ==== + * topic information, which are relevant to topicListPage + * can improved by not always calling getTopicListPage().forceLoadTopics() but rather updating the changed/modified topic in topicList. + * */ + if(StringUtils.equals(action, "addContributor")){ + getSessionBean().getTopicPage().addContributor(); + getSessionBean().getTopicListPage().forceLoadTopics(); + + } else if(StringUtils.equals(action, "removeContributor")){ + getSessionBean().getTopicPage().removeContributor(); + getSessionBean().getTopicListPage().forceLoadTopics(); + + } else if( StringUtils.equals(action ,"updateDescription")) { + getSessionBean().getTopicPage().updateDescription(); + getSessionBean().getTopicListPage().forceLoadTopics(); + + /* ====== */ + + + } else if( StringUtils.equals(action ,"deleteSection")) { + getSessionBean().getTopicPage().deleteSection(getLongParameter("sectionId")); + + } else if(StringUtils.equals(action, "addSectionToTopic")) { Long selectedSectionId = getLongParameter("selectedSectionId"); Long selectedTopicId = getLongParameter("selectedTopicId"); @@ -407,7 +413,7 @@ getSessionBean().getBooksPage().filter(); - //PAGINATOR + //PAGINATOR } else if(StringUtils.equals(action, "firstPage")){ getSessionBean().getBooksPage().firstPage(); } else if(StringUtils.equals(action, "fastRewind")){ @@ -496,9 +502,8 @@ //Default Page: - return TopicListPage.page; + return TopicListPage.page; // will be the new home page //return HomePage.page; - //return "pages/search.jsp"; }