From kcardineaud@users.nuiton.org Wed Jul  6 11:05:42 2011
From: kcardineaud@users.nuiton.org
To: scmwebeditor-commits@list.nuiton.org
Subject: [Scmwebeditor-commits] r159 - in trunk/src/main:
	java/org/nuiton/scmwebeditor/actions webapp
Date: Wed, 06 Jul 2011 11:05:42 +0200
Message-ID: <20110706090542.46F0B15921@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7904152880407444225=="

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

Author: kcardineaud
Date: 2011-07-06 11:05:42 +0200 (Wed, 06 Jul 2011)
New Revision: 159

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

Log:
Add a filter that allow to click only on file in svn tree


Modified:
   trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java
   trunk/src/main/webapp/Search.jsp

Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.ja=
va
=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/nuiton/scmwebeditor/actions/SearchAction.java	201=
1-07-05 14:26:01 UTC (rev 158)
+++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java	201=
1-07-06 09:05:42 UTC (rev 159)
@@ -208,7 +208,7 @@
             for (UrlSvnFile file : files ) {
                 TreeNode node =3D new TreeNode();
                 node.setId(file.toString());
-                node.setTitle(file.toString());
+                node.setTitle(file.toString().substring(file.toString().last=
IndexOf("/")+1));
                 node.setState(TreeNode.NODE_STATE_LEAF);
                 node.setIcon("ui-icon-document");
                 nodes.add(node);
@@ -218,14 +218,12 @@
             Iterator<Entry<String, String>> iter1 =3D directories.entrySet()=
.iterator();
             while (iter1.hasNext()) {
                 Map.Entry<String,String> ent =3D (Map.Entry<String,String>) =
iter1.next();
-                //La cl=C3=A9 de la HashMap
=20
-                //La Valeur de la HashMap
                 String value =3D ent.getValue();
         =20
                 TreeNode node =3D new TreeNode();
                 node.setId(value);
-                node.setTitle(value);
+                node.setTitle(value.substring(value.lastIndexOf("/")));
                 nodes.add(node);
                =20
                =20
@@ -307,7 +305,6 @@
         return result;
     }
    =20
-    //public String getFileOrDirName(Strin)
    =20
    =20
     public static String replaceLast(String string, String toReplace, String=
 replacement) {

Modified: trunk/src/main/webapp/Search.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/Search.jsp	2011-07-05 14:26:01 UTC (rev 158)
+++ trunk/src/main/webapp/Search.jsp	2011-07-06 09:05:42 UTC (rev 159)
@@ -11,44 +11,14 @@
 =20
  <sj:head debug=3D"true" jquerytheme=3D"default"/>
=20
-
-        <!--<s:if test=3D"!files.empty">-->
-        <!--=20
-        <table>
-            <s:iterator value=3D"files">
-                <tr><td><a href=3D"checkout.action?address=3D<s:property/>">=
<s:property/> <s:property value=3D"level"/></a></td></tr>
-            </s:iterator>
-
-
-            <s:iterator value=3D"directories" var=3D"directory" >
-                <tr><td>
-              =20
-                    <sj:a=20
-			        id=3D"%{key}Button"=20
-			        targets=3D"htmlcontent%{key}"=20
-			        href=3D"search.action?address=3D%{value}"=20
-			        >
-			        <s:property value=3D"key"/>
-			        </sj:a>
-			   =20
-               =20
-                <div id=3D"htmlcontent${directory.key}" ></div>
-               =20
-                </td></tr>
-            </s:iterator>
-=20
-           =20
-        </table>
-         -->
-       =20
-        <!--</s:if>-->
-
-
-   =20
 <script>
 $.subscribe('treeClicked', function(event, data) {
     var item =3D event.originalEvent.data.rslt.obj;
-    document.location.href=3D("checkout.action?address=3D"+item.attr("id"))
+
+    if(item.text().indexOf("/") =3D=3D -1) {
+    	document.location.href=3D("checkout.action?address=3D"+item.attr("id"));
+    }
+
 });
=20
 </script>


--===============7904152880407444225==--