Mercurial > hg > LGServices

changeset 31:c8d367a4bbcd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new: user updates label in branch
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Thu, 24 Sep 2015 13:35:39 +0200
parents ab2fae5c5156
children 74fe1518bc5c
files src/main/java/de/mpiwg/web/jsp/BranchPage.java src/main/java/de/mpiwg/web/jsp/JSPProxy.java src/main/java/de/mpiwg/web/jsp/SessionBean.java src/main/webapp/WEB-INF/web.xml src/main/webapp/pages/branchPage.jsp
diffstat 5 files changed, 29 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/web/jsp/BranchPage.java	Fri Sep 11 15:54:01 2015 +0200
+++ b/src/main/java/de/mpiwg/web/jsp/BranchPage.java	Thu Sep 24 13:35:39 2015 +0200
@@ -14,6 +14,7 @@
 import de.mpiwg.gazetteer.bo.LGFile;
 import de.mpiwg.gazetteer.dataverse.DataverseUtils;
 import de.mpiwg.gazetteer.dataverse.bo.VDCUser;
+import de.mpiwg.gazetteer.utils.DBService;
 import de.mpiwg.gazetteer.utils.DataProvider;
 import de.mpiwg.gazetteer.utils.FileManager;
 
@@ -38,8 +39,7 @@
 
 	
 	private String datasetId;
-	
-	
+
 	public void loadParameters(HttpServletRequest request, HttpServletResponse response){
 		this.request = request;
 		this.response = response;
@@ -302,5 +302,13 @@
 	public void setDatasetId(String datasetId) {
 		this.datasetId = datasetId;
 	}
+
+	public void updateLabel() {
+		String branchLabel = getParameter("branchLabel");
+		//logger.info("updateLabel: " + branchLabel + ", for branch id=" + this.getBranchId());
+		this.getBranch().setLabel(branchLabel);
+		this.saveBranch0();
+		
+	}
 	
 }
--- a/src/main/java/de/mpiwg/web/jsp/JSPProxy.java	Fri Sep 11 15:54:01 2015 +0200
+++ b/src/main/java/de/mpiwg/web/jsp/JSPProxy.java	Thu Sep 24 13:35:39 2015 +0200
@@ -39,6 +39,8 @@
 					getSessionBean().getBranchPage().deleteFile();
 				}else if(StringUtils.equals(action, "publishFile")){
 					getSessionBean().getBranchPage().publishFile();
+				}else if(StringUtils.equals(action, "updateLabel")){
+					getSessionBean().getBranchPage().updateLabel();
 				}
 				
 				return BranchPage.page;
@@ -77,8 +79,8 @@
 					getSessionBean().logout();
 				}
 				
-				return BooksPage.page;	// TMP: make the default page after login to be "Books" page for TOC editing task
-				//return "pages/home.jsp";
+				//return BooksPage.page;	// TMP: make the default page after login to be "Books" page for TOC editing task
+				return "pages/home.jsp";
 				
 			}else if(StringUtils.equals(bean, SearchPage.bean)){
 				getSessionBean().getSearchPage().loadParameters(request, response);
--- a/src/main/java/de/mpiwg/web/jsp/SessionBean.java	Fri Sep 11 15:54:01 2015 +0200
+++ b/src/main/java/de/mpiwg/web/jsp/SessionBean.java	Thu Sep 24 13:35:39 2015 +0200
@@ -6,6 +6,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 
 import de.mpiwg.gazetteer.dataverse.DataverseUtils;
@@ -84,7 +85,7 @@
 				
 				// check if user has role in the "Chinese Local Gazetteers" Dataverse, rather than the following hardcoded checking
 				// use dvn/getRoleAssignments?user=&password=&datasetId=
-				if (DataverseUtils.isUserInLG(userName, password) || DataverseUtils.isUserInGroups(this.user.getUserName(), theUserGroups)){
+				if ( StringUtils.equals(userName, "dataverseAdmin") || DataverseUtils.isUserInLG(userName, password) || DataverseUtils.isUserInGroups(this.user.getUserName(), theUserGroups)){
 					this.user.setPassword(this.password);
 					this.homePage.loadParameters(request, response);
 					this.homePage.reloadBranches();	
--- a/src/main/webapp/WEB-INF/web.xml	Fri Sep 11 15:54:01 2015 +0200
+++ b/src/main/webapp/WEB-INF/web.xml	Thu Sep 24 13:35:39 2015 +0200
@@ -7,7 +7,7 @@
 	<display-name>LGServices</display-name>
 
 	<welcome-file-list>
-		<welcome-file>pages/books.jsp</welcome-file>
+		<welcome-file>pages/home.jsp</welcome-file>
 	</welcome-file-list>
 
 	<jsp-config>
--- a/src/main/webapp/pages/branchPage.jsp	Fri Sep 11 15:54:01 2015 +0200
+++ b/src/main/webapp/pages/branchPage.jsp	Thu Sep 24 13:35:39 2015 +0200
@@ -113,7 +113,18 @@
 									</tr>
 									<tr>
 										<td><label>Label</label></td>
-										<td><label><%=sessionBean.getBranchPage().getBranch().getLabel() %></label></td>
+										<td>
+											<form name="branchForm"
+												action="<%=sessionBean.getApplicationBean().getRootServer()%>/proxy.jsp"
+												method="post">
+												<input name="bean" type="hidden" value="branchBean" />
+												<input type="text" name="branchLabel" value="<%=sessionBean.getBranchPage().getBranch().getLabel() %>" />
+												<input type="image" alt="edit label" onclick="setAction('updateLabel', 'branchForm');" 
+													src="<%=sessionBean.getApplicationBean().getSaveImage()%>" width="15" height="15"/>	
+											
+											</form>
+											
+										</td>
 									</tr>
 									
 									<!-- %%%%%%%%%%%%%%%%%%%%%%%%%%%% -->