Pull up fix for CONNECTORS-761 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/release-1.3-branch@1507239 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index a1baa85..b5f2ece 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,10 @@
======================= Release 1.3 =====================
+CONNECTORS-761: Fix broken tab in Jira authority connector, and
+don't use startsWith in javascript since IE doesn't recognize it.
+(Shinichiro Abe, Karl Wright)
+
CONNECTORS-760: HDFSRepositoryConnector's version string is always start with '-'.
(Minoru Osuka)
diff --git a/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraAuthorityConnector.java b/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraAuthorityConnector.java
index 45685f0..c815777 100644
--- a/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraAuthorityConnector.java
+++ b/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraAuthorityConnector.java
@@ -52,7 +52,7 @@
private final static String defaultAuthorityDenyToken = "DEAD_AUTHORITY";
// Configuration tabs
- private static final String JIRA_SERVER_TAB_PROPERTY = "JiraRepositoryConnector.Server";
+ private static final String JIRA_SERVER_TAB_PROPERTY = "JiraAuthorityConnector.Server";
// Template names for configuration
/**
diff --git a/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/jira/editConfiguration_jira_server.js b/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/jira/editConfiguration_jira_server.js
index bfab5ad..3c5df7d 100644
--- a/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/jira/editConfiguration_jira_server.js
+++ b/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/jira/editConfiguration_jira_server.js
@@ -33,7 +33,7 @@
return false;
}
- if (editconnection.jirapath.value != "" && !editconnection.jirapath.value.startsWith("/"))
+ if (editconnection.jirapath.value != "" && !(editconnection.jirapath.value.indexOf("/") == 0))
{
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('JiraAuthorityConnector.JiraPathMustBeginWithASlash'))");
editconnection.jirapath.focus();
@@ -78,7 +78,7 @@
return false;
}
- if (editconnection.jirapath.value != "" && !editconnection.jirapath.value.startsWith("/"))
+ if (editconnection.jirapath.value != "" && !(editconnection.jirapath.value.indexOf("/") == 0))
{
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('JiraAuthorityConnector.JiraPathMustBeginWithASlash'))");
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('JiraAuthorityConnector.Server'))");
diff --git a/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_server.js b/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_server.js
index e5bd2d6..6c81117 100644
--- a/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_server.js
+++ b/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_server.js
@@ -33,7 +33,7 @@
return false;
}
- if (editconnection.jirapath.value != "" && !editconnection.jirapath.value.startsWith("/"))
+ if (editconnection.jirapath.value != "" && !(editconnection.jirapath.value.indexOf("/") == 0))
{
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('JiraRepositoryConnector.JiraPathMustBeginWithASlash'))");
editconnection.jirapath.focus();
@@ -78,7 +78,7 @@
return false;
}
- if (editconnection.jirapath.value != "" && !editconnection.jirapath.value.startsWith("/"))
+ if (editconnection.jirapath.value != "" && !(editconnection.jirapath.value.indexOf("/") == 0))
{
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('JiraRepositoryConnector.JiraPathMustBeginWithASlash'))");
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('JiraRepositoryConnector.Server'))");
