From bbrossaud@users.chorem.org Thu Jul 15 11:14:24 2010
From: bbrossaud@users.chorem.org
To: bow-commits@list.chorem.org
Subject: [Bow-commits] r84 - in trunk/src/main: java/org/chorem/bow webapp
Date: Thu, 15 Jul 2010 11:14:24 +0200
Message-ID: <20100715091424.AF1EE1591F@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7306036404942999548=="

--===============7306036404942999548==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: bbrossaud
Date: 2010-07-15 11:14:24 +0200 (Thu, 15 Jul 2010)
New Revision: 84

Url: http://chorem.org/repositories/revision/bow/84

Log:
moved regenerate token in preferences page

Modified:
   trunk/src/main/java/org/chorem/bow/ControllerServlet.java
   trunk/src/main/webapp/bookmarkHome.jsp
   trunk/src/main/webapp/bookmarkSearch.jsp
   trunk/src/main/webapp/preferences.jsp

Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/org/chorem/bow/ControllerServlet.java	2010-07-15 08:4=
3:11 UTC (rev 83)
+++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java	2010-07-15 09:1=
4:24 UTC (rev 84)
@@ -163,6 +163,7 @@
                         log.debug("Going to actionGenerateToken");
                     }
                     this.actionGenerateToken(request, response, user, sessio=
n);
+                    request.getRequestDispatcher("preferences.jsp").forward(=
request, response);
                 } else if (action.equals("deleteTag") && user !=3D null) {
                     if (log.isDebugEnabled()) {
                         log.debug("Going to actionDeleteTag");
@@ -492,7 +493,6 @@
                 tokenActions.setPermanentToken("");
             }
         }
-        redirectToTheGoodPage(request, response);
     }
=20
     protected void actionModifyBookmark(HttpServletRequest request, HttpServ=
letResponse response, User user)
@@ -1025,11 +1025,11 @@
                 }
             }
         }
-        proxy.store(newUser);
+        newUser =3D proxy.store(newUser);
+        session.setAttribute("user", newUser);
=20
-        session.setAttribute("user", newUser);
         preference =3D proxy.restore(Preference.class, newUser.getWikittyId(=
));
-        request.setAttribute("preference", preference);
+        session.setAttribute("preference", preference);
     }
=20
     protected void sendMail(String email, String password)

Modified: trunk/src/main/webapp/bookmarkHome.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/webapp/bookmarkHome.jsp	2010-07-15 08:43:11 UTC (rev 83)
+++ trunk/src/main/webapp/bookmarkHome.jsp	2010-07-15 09:14:24 UTC (rev 84)
@@ -129,7 +129,6 @@
                     <li><a href=3D"bow?action=3Dpreferences">Preferences</a>=
</li>
                     <li><a href=3D"javascript:var%20url=3Dlocation.href;var%=
20nameAndTags=3Dprompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des=
%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|'=
);if%20(nameAndTags!=3D(document.title+'|')){var%20link=3D'<%=3Durl%>bow?acti=
on=3DaddUrl&token=3D<%=3DtemporaryToken%>&url=3D'+encodeURIComponent(url)+'&n=
ameAndTags=3D'+encodeURIComponent(nameAndTags);var%20script=3Ddocument.create=
Element('script');script.src=3Dlink;script.type=3D'text/javascript';document.=
body.appendChild(script);}void(0);">Temporary token</a></li>
                     <li><a href=3D"javascript:var%20url=3Dlocation.href;var%=
20nameAndTags=3Dprompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des=
%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|'=
);if%20(nameAndTags!=3D(document.title+'|')){var%20link=3D'<%=3Durl%>bow?acti=
on=3DaddUrl&token=3D<%=3DpermanentToken%>&url=3D'+encodeURIComponent(url)+'&n=
ameAndTags=3D'+encodeURIComponent(nameAndTags);var%20script=3Ddocument.create=
Element('script');script.src=3Dlink;script.type=3D'text/javascript';document.=
body.appendChild(script);}void(0);">Current permanent token</a></li>
-                    <li><a href=3D"bow?action=3DgenerateToken">Regenerate pe=
rmanent token</a></li>
                 </ul>
                 <div id=3D"nuage">
                     <jsp:include page=3D"tagsCloud.jsp" flush=3D"true" />

Modified: trunk/src/main/webapp/bookmarkSearch.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/webapp/bookmarkSearch.jsp	2010-07-15 08:43:11 UTC (rev 83)
+++ trunk/src/main/webapp/bookmarkSearch.jsp	2010-07-15 09:14:24 UTC (rev 84)
@@ -111,7 +111,6 @@
                     <li><a href=3D"bow?action=3Dpreferences">Preferences</a>=
</li>
                     <li><a href=3D"javascript:var%20url=3Dlocation.href;var%=
20nameAndTags=3Dprompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des=
%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|'=
);var%20link=3D'<%=3Durl%>bow?action=3DaddUrl&token=3D<%=3DtemporaryToken%>&u=
rl=3D'+encodeURIComponent(url)+'&nameAndTags=3D'+encodeURIComponent(nameAndTa=
gs);var%20script=3Ddocument.createElement('script');script.src=3Dlink;script.=
type=3D'text/javascript';document.body.appendChild(script);void(0);">Temporar=
y token</a></li>
                     <li><a href=3D"javascript:var%20url=3Dlocation.href;var%=
20nameAndTags=3Dprompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des=
%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|'=
);var%20link=3D'<%=3Durl%>bow?action=3DaddUrl&token=3D<%=3DpermanentToken%>&u=
rl=3D'+encodeURIComponent(url)+'&nameAndTags=3D'+encodeURIComponent(nameAndTa=
gs);var%20script=3Ddocument.createElement('script');script.src=3Dlink;script.=
type=3D'text/javascript';document.body.appendChild(script);void(0);">Current =
permanent token</a></li>
-                    <li><a href=3D"bow?action=3DgenerateToken&searchLine=3D<=
%=3DsearchLine%>&fullTextLine=3D<%=3DfullText%>">Regenerate permanent token</=
a></li>
                 </ul>
                 <div id=3D"nuage">
                     <jsp:include page=3D"tagsCloud.jsp" flush=3D"true">

Modified: trunk/src/main/webapp/preferences.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/webapp/preferences.jsp	2010-07-15 08:43:11 UTC (rev 83)
+++ trunk/src/main/webapp/preferences.jsp	2010-07-15 09:14:24 UTC (rev 84)
@@ -55,8 +55,11 @@
                         <input type=3Dpassword name=3D"newPassword"/>
                         <p>Confirm new password</p>
                         <input type=3Dpassword name=3D"confirmNewPassword"/>
-                        <br/>
+                        <br/> <br />
+                        <a href=3D"bow?action=3DgenerateToken">Regenerate pe=
rmanent token</a>
=20
+                        <br /> <br />
+                       =20
                         <h1>Site look</h1>
                         <p>Site color</p>
                         <input type=3D"text" name=3D"colors" value=3D"<%=3Dp=
reference.getColors()%>"/>


--===============7306036404942999548==--