r191 - trunk/src/main/webapp/WEB-INF/content - Scmwebeditor-commits

28 Jul 2011

Author: kcardineaud
Date: 2011-07-28 15:55:23 +0200 (Thu, 28 Jul 2011)
New Revision: 191

Url: http://nuiton.org/repositories/revision/scmwebeditor/191

Log:
Fix a bug : after a save and continue action, we can save without modify the file

Modified:
   trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp
   trunk/src/main/webapp/WEB-INF/content/save.jsp

Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp
===================================================================

--- trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp	2011-07-28 12:38:56 UTC (rev 190)
+++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp	2011-07-28 13:55:23 UTC (rev 191)
@@ -48,7 +48,7 @@
        
     
 </head>
-<body onload="geresession(<%=request.getAttribute("InvalidateMaxTime")%>, 5);">
+<body>
     <a title="ScmWebEditor Project Website" target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="ScmWebEditor logo"/></a>
         
     <center>
@@ -57,7 +57,7 @@
         String typeEditor="null";
         if (request.getAttribute("format")!=null && request.getAttribute("format").equals("rst")) {        
             %>
-	            <h4><s:text name="scm.info.ProblemWithRst"/> <a href="http://docutils.sourceforge.net/rst.html"><s:text name="scm.info.rstWebsite"/></a>.</h4>
+	            <h4><s:text name="scm.info.ProblemWithRst"/> <a href="http://docutils.sourceforge.net/docs/user/rst/quickref.html"><s:text name="scm.info.rstWebsite"/></a>.</h4>
      <% } %>
     </center>
     
@@ -184,7 +184,7 @@
             <input type="hidden" NAME=pw /><%
         }%>
     <input type="hidden" name="address" value="<%=request.getAttribute("address")%>"/>
-    <input type="hidden" name="origText" value="<%=request.getAttribute("OrigText")%>"/>
+    <input type="hidden" id="origText" name="origText" value="<%=request.getAttribute("OrigText")%>"/>
      <%  if(request.getAttribute("lastText")!=null) { %>    
         <input type="hidden" name="lastText" value="<%=request.getAttribute("lastText")%>" />
     <% } %>

Modified: trunk/src/main/webapp/WEB-INF/content/save.jsp
===================================================================
--- trunk/src/main/webapp/WEB-INF/content/save.jsp	2011-07-28 12:38:56 UTC (rev 190)
+++ trunk/src/main/webapp/WEB-INF/content/save.jsp	2011-07-28 13:55:23 UTC (rev 191)
@@ -17,4 +17,11 @@
     </s:elseif>
     <s:else>
         <h4>Last change save <s:property value="formatDate"  /> </h4>
+        <s:set id="lastRevSet" value="newText" />
+        <s:hidden id="lastRev" value="%{lastRevSet}" />
+        <script type="text/javascript">
+            origText = document.getElementById("origText"); 
+            origText.value = document.getElementById("lastRev").value;
+        
+        </script>
     </s:else>
\ No newline at end of file

    

r191 - trunk/src/main/webapp/WEB-INF/content

kcardineaud＠users.nuiton.org

tags

participants (1)