Mercurial > hg > LGServices

changeset 65:db737aead627

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor fixed
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Tue, 26 Jul 2016 11:52:54 +0200
parents 4c8fed0d71cc
children f106f2487ac1
files src/main/java/de/mpiwg/web/jsp/JSPProxy.java src/main/java/de/mpiwg/web/jsp/TopicListPage.java
diffstat 2 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/web/jsp/JSPProxy.java	Mon Jul 25 17:08:06 2016 +0200
+++ b/src/main/java/de/mpiwg/web/jsp/JSPProxy.java	Tue Jul 26 11:52:54 2016 +0200
@@ -380,19 +380,19 @@
 				 * */
 				if(StringUtils.equals(action, "addContributor")){
 					getSessionBean().getTopicPage().addContributor();
-					getSessionBean().getTopicListPage().forceLoadTopics();
+					//getSessionBean().getTopicListPage().forceLoadTopics();
 				
 				} else if(StringUtils.equals(action, "removeContributor")){
 					getSessionBean().getTopicPage().removeContributor();
-					getSessionBean().getTopicListPage().forceLoadTopics();
+					//getSessionBean().getTopicListPage().forceLoadTopics();
 					
 				} else if( StringUtils.equals(action ,"updateDescription")) {
 					getSessionBean().getTopicPage().updateDescription();
-					getSessionBean().getTopicListPage().forceLoadTopics();
+					//getSessionBean().getTopicListPage().forceLoadTopics();
 					
 				} else if( StringUtils.equals(action ,"updateKeywords")) {
 					getSessionBean().getTopicPage().updateKeywords();
-					getSessionBean().getTopicListPage().forceLoadTopics();
+					//getSessionBean().getTopicListPage().forceLoadTopics();
 			
 					
 				/* ====== */
--- a/src/main/java/de/mpiwg/web/jsp/TopicListPage.java	Mon Jul 25 17:08:06 2016 +0200
+++ b/src/main/java/de/mpiwg/web/jsp/TopicListPage.java	Tue Jul 26 11:52:54 2016 +0200
@@ -62,15 +62,17 @@
 	public void forceLoadTopics(){
 		logger.debug("forceLoadTopics");
 		
+		
 		DataProvider.getInstance().setTopicMap(null);
 		DataProvider.getInstance().setTopicSectionRelationMap(null); 
-		
-		
+	
+	
 		this.completeTopicList = new ArrayList<LGTopic>();
-		
+	
 		// sometimes this.getSessionBean() will cause NullPointerException. Fixed.
-		
+	
 		if(getSessionBean().getUser() != null){
+				
 			for(LGTopic topic : DataProvider.getInstance().getTopics(this.getSessionBean().getUser().getId())){
 				
 				if (topic.isEmpty()) {