You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2012/06/25 00:26:19 UTC
svn commit: r1353354 - in /manifoldcf/branches/CONNECTORS-474: ./ CHANGES.txt
connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
Author: kwright
Date: Sun Jun 24 22:26:18 2012
New Revision: 1353354
URL: http://svn.apache.org/viewvc?rev=1353354&view=rev
Log:
Merge UI fixes for FileNet connector from trunk.
Modified:
manifoldcf/branches/CONNECTORS-474/ (props changed)
manifoldcf/branches/CONNECTORS-474/CHANGES.txt
manifoldcf/branches/CONNECTORS-474/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
Propchange: manifoldcf/branches/CONNECTORS-474/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1353352
Modified: manifoldcf/branches/CONNECTORS-474/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-474/CHANGES.txt?rev=1353354&r1=1353353&r2=1353354&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-474/CHANGES.txt (original)
+++ manifoldcf/branches/CONNECTORS-474/CHANGES.txt Sun Jun 24 22:26:18 2012
@@ -3,6 +3,10 @@ $Id$
======================= 0.6-dev =====================
+CONNECTORS-484: The FileNet connector UI has been broken since
+the i18n work was done on it.
+(Joe Becknell, Karl Wright)
+
CONNECTORS-472: Make changes related to graduation.
(Karl Wright)
Modified: manifoldcf/branches/CONNECTORS-474/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-474/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java?rev=1353354&r1=1353353&r2=1353354&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-474/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java (original)
+++ manifoldcf/branches/CONNECTORS-474/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java Sun Jun 24 22:26:18 2012
@@ -1884,7 +1884,7 @@ public class FilenetConnector extends or
"{\n"+
" if (editjob.pathaddon.value == \"\")\n"+
" {\n"+
-" alert(" + Messages.getBodyJavascriptString(locale,"FilenetConnector.SelectAFolderFirst") + ");\n"+
+" alert(\"" + Messages.getBodyJavascriptString(locale,"FilenetConnector.SelectAFolderFirst") + "\");\n"+
" editjob.pathaddon.focus();\n"+
" return;\n"+
" }\n"+
@@ -1895,13 +1895,13 @@ public class FilenetConnector extends or
"{\n"+
" if (eval(\"editjob.matchfield_\"+docclass+\".value\") == \"\")\n"+
" {\n"+
-" alert(" + Messages.getBodyJavascriptString(locale,"FilenetConnector.SelectAFieldFirst") + ");\n"+
+" alert(\"" + Messages.getBodyJavascriptString(locale,"FilenetConnector.SelectAFieldFirst") + "\");\n"+
" eval(\"editjob.matchfield_\"+docclass+\".focus()\");\n"+
" return;\n"+
" }\n"+
" if (eval(\"editjob.matchtype_\"+docclass+\".value\") == \"\")\n"+
" {\n"+
-" alert(" + Messages.getBodyJavascriptString(locale,"FilenetConnector.SelectAMatchType") + ");\n"+
+" alert(\"" + Messages.getBodyJavascriptString(locale,"FilenetConnector.SelectAMatchType") + "\");\n"+
" eval(\"editjob.matchtype_\"+docclass+\".focus()\");\n"+
" return;\n"+
" }\n"+
@@ -1913,7 +1913,7 @@ public class FilenetConnector extends or
"{\n"+
" if (editjob.spectoken.value == \"\")\n"+
" {\n"+
-" alert(" + Messages.getBodyJavascriptString(locale,"FilenetConnector.NullTokensNotAllowed") + ");\n"+
+" alert(\"" + Messages.getBodyJavascriptString(locale,"FilenetConnector.NullTokensNotAllowed") + "\");\n"+
" editjob.spectoken.focus();\n"+
" return;\n"+
" }\n"+
@@ -2035,7 +2035,7 @@ public class FilenetConnector extends or
" <input type=\"button\" value=\"" + Messages.getAttributeString(locale,"FilenetConnector.Add") + "\" alt=\"" + Messages.getAttributeString(locale,"FilenetConnector.AddPath") + "\" onClick='Javascript:SpecOp(\"pathop\",\"Add\",\"path_"+Integer.toString(k+1)+"\")'/>\n"+
" "+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(pathSoFar)+"\n"
);
- if (pathSoFar.length() > 0)
+ if (pathSoFar.length() > 0 && !pathSoFar.equals("/"))
{
out.print(
" <input type=\"button\" value=\"-\" alt=\"" + Messages.getAttributeString(locale,"FilenetConnector.RemoveFromPath") + "\" onClick='Javascript:SpecOp(\"pathop\",\"Up\",\"path_"+Integer.toString(k)+"\")'/>\n"