Menu
▾
▴
[Treebase-guts] SF.net SVN: treebase:[399] trunk/treebase-web/src/main/webapp/WEB-INF/pages
|
From: <yo...@us...> - 2009-12-18 19:03:45
|
Revision: 399
http://treebase.svn.sourceforge.net/treebase/?rev=399&view=rev
Author: youjun
Date: 2009-12-18 19:03:26 +0000 (Fri, 18 Dec 2009)
Log Message:
-----------
1. make "ready" submission editable by Admin and Assis Editor
2. add link from submissionSummary back to changeStudyStatus
Modified Paths:
--------------
trunk/treebase-web/src/main/webapp/WEB-INF/pages/addPersonForm.jsp
trunk/treebase-web/src/main/webapp/WEB-INF/pages/analysisForm.jsp
trunk/treebase-web/src/main/webapp/WEB-INF/pages/citationForm.jsp
trunk/treebase-web/src/main/webapp/WEB-INF/pages/matrixList.jsp
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/treeBlocks.jsp
trunk/treebase-web/src/main/webapp/WEB-INF/pages/studyForm.jsp
trunk/treebase-web/src/main/webapp/WEB-INF/pages/submissionSummaryView.jsp
trunk/treebase-web/src/main/webapp/WEB-INF/pages/treeBlockList.jsp
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/addPersonForm.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/addPersonForm.jsp 2009-12-16 17:57:12 UTC (rev 398)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/addPersonForm.jsp 2009-12-18 19:03:26 UTC (rev 399)
@@ -81,7 +81,11 @@
<tr>
- <c:if test="${publicationState eq 'NotReady'}">
+ <%if(request.isUserInRole("Admin") || request.isUserInRole("Associate Editor")){%>
+ <% request.setAttribute("isEditable","yes");%>
+ <% } %>
+
+ <c:if test="${publicationState eq 'NotReady'||isEditable eq 'yes'}">
<td></td>
<td colspan="5">
<input type="submit" name="Submit" value="<fmt:message key="button.submit"/>" />
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/analysisForm.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/analysisForm.jsp 2009-12-16 17:57:12 UTC (rev 398)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/analysisForm.jsp 2009-12-18 19:03:26 UTC (rev 399)
@@ -50,7 +50,11 @@
<tr>
<th></th>
<td>
- <c:if test="${publicationState eq 'NotReady'}">
+ <%if(request.isUserInRole("Admin") || request.isUserInRole("Associate Editor")){%>
+ <% request.setAttribute("isEditable","yes");%>
+ <% } %>
+
+ <c:if test="${publicationState eq 'NotReady'||isEditable eq 'yes'}">
<c:choose>
<c:when test="${analysis.id == null}">
<input type="submit" name="Submit" value="<fmt:message key="button.submit"/>" />
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/citationForm.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/citationForm.jsp 2009-12-16 17:57:12 UTC (rev 398)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/citationForm.jsp 2009-12-18 19:03:26 UTC (rev 399)
@@ -75,7 +75,12 @@
</c:when>
</c:choose>
<tr>
- <c:if test="${publicationState eq 'NotReady'}">
+
+ <%if(request.isUserInRole("Admin") || request.isUserInRole("Associate Editor")){%>
+ <% request.setAttribute("isEditable","yes");%>
+ <% } %>
+
+ <c:if test="${publicationState eq 'NotReady'||isEditable eq 'yes'}">
<th></th>
<td colspan="5" align="center">
<c:choose>
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/matrixList.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/matrixList.jsp 2009-12-16 17:57:12 UTC (rev 398)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/matrixList.jsp 2009-12-18 19:03:26 UTC (rev 399)
@@ -131,7 +131,11 @@
</c:if>
<display:footer>
- <c:if test="${publicationState eq 'NotReady'}">
+ <%if(request.isUserInRole("Admin") || request.isUserInRole("Associate Editor")){%>
+ <% request.setAttribute("isEditable","yes");%>
+ <% } %>
+
+ <c:if test="${publicationState eq 'NotReady'||isEditable eq 'yes'}">
<tr>
<td colspan="8" align="center">
<input type="submit" class="button" name="Update" value="<fmt:message key="button.update"/>" />
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/treeBlocks.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/treeBlocks.jsp 2009-12-16 17:57:12 UTC (rev 398)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/treeBlocks.jsp 2009-12-18 19:03:26 UTC (rev 399)
@@ -70,7 +70,11 @@
<a href="javascript:popupWithSizes('${url}',900,800,'1')">View trees</a>
</display:column>
- <c:if test="${publicationState eq 'NotReady'}">
+ <%if(request.isUserInRole("Admin") || request.isUserInRole("Associate Editor")){%>
+ <% request.setAttribute("isEditable","yes");%>
+ <% } %>
+
+ <c:if test="${publicationState eq 'NotReady'||isEditable eq 'yes'}">
<display:column titleKey="link.delete"
sortable="false"
url="/user/deleteATreeBlock.html" paramId="treeblockid" paramProperty="id"
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/studyForm.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/studyForm.jsp 2009-12-16 17:57:12 UTC (rev 398)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/studyForm.jsp 2009-12-18 19:03:26 UTC (rev 399)
@@ -71,7 +71,11 @@
<c:if test="${publicationState eq 'Ready' || publicationState eq 'Published'}">
<Strong>For now, this study is read only.</Strong>
</c:if>
- <c:if test="${publicationState eq 'NotReady'}">
+ <%if(request.isUserInRole("Admin") || request.isUserInRole("Associate Editor")){%>
+ <% request.setAttribute("isEditable","yes");%>
+ <% } %>
+
+ <c:if test="${publicationState eq 'NotReady'||isEditable eq 'yes'}">
<c:choose>
<c:when test="${study.id == null }">
<input type="submit" name="Submit" value="<fmt:message key="button.submit"/>"/>
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/submissionSummaryView.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/submissionSummaryView.jsp 2009-12-16 17:57:12 UTC (rev 398)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/submissionSummaryView.jsp 2009-12-18 19:03:26 UTC (rev 399)
@@ -9,7 +9,7 @@
<legend>Summary
<a href="#" class="openHelp" onclick="openHelp('submissionSummaryView')"><img class="iconButton" alt="help" src="<fmt:message key="icons.help"/>" /></a>
</legend>
-Submission: <c:out value="${submissionNumber}"/>, <c:out value="${studyStatus}"/><br/>
+Submission: <c:out value="${submissionNumber}"/>, <c:out value="${studyStatus}"/>, <a href="/treebase-web/admin/changeStudyStatus.html"> Update Status</a><br/>
Submission initiated: <c:out value="${initiatedDate}"/><br/>
<c:if test="${not empty citationsummary.study}">
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/treeBlockList.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/treeBlockList.jsp 2009-12-16 17:57:12 UTC (rev 398)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/treeBlockList.jsp 2009-12-18 19:03:26 UTC (rev 399)
@@ -132,7 +132,11 @@
</c:if>
<display:footer>
- <c:if test="${publicationState eq 'NotReady'}">
+ <%if(request.isUserInRole("Admin") || request.isUserInRole("Associate Editor")){%>
+ <% request.setAttribute("isEditable","yes");%>
+ <% } %>
+
+ <c:if test="${publicationState eq 'NotReady'||isEditable eq 'yes'}">
<tr>
<td colspan="7" align="center">
<input type="submit" class="button" name="Update" value="<fmt:message key="button.update"/>" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
