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 2013/07/26 11:48:16 UTC
svn commit: r1507239 - in /manifoldcf/branches/release-1.3-branch: ./
connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/
connectors/jira/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities...
Author: kwright
Date: Fri Jul 26 09:48:16 2013
New Revision: 1507239
URL: http://svn.apache.org/r1507239
Log:
Pull up fix for CONNECTORS-761 from trunk.
Modified:
manifoldcf/branches/release-1.3-branch/ (props changed)
manifoldcf/branches/release-1.3-branch/CHANGES.txt
manifoldcf/branches/release-1.3-branch/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraAuthorityConnector.java
manifoldcf/branches/release-1.3-branch/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/jira/editConfiguration_jira_server.js
manifoldcf/branches/release-1.3-branch/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_server.js
Propchange: manifoldcf/branches/release-1.3-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1507236
Modified: manifoldcf/branches/release-1.3-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.3-branch/CHANGES.txt?rev=1507239&r1=1507238&r2=1507239&view=diff
==============================================================================
--- manifoldcf/branches/release-1.3-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.3-branch/CHANGES.txt Fri Jul 26 09:48:16 2013
@@ -3,6 +3,10 @@ $Id$
======================= 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)
Modified: manifoldcf/branches/release-1.3-branch/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraAuthorityConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.3-branch/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraAuthorityConnector.java?rev=1507239&r1=1507238&r2=1507239&view=diff
==============================================================================
--- manifoldcf/branches/release-1.3-branch/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraAuthorityConnector.java (original)
+++ manifoldcf/branches/release-1.3-branch/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraAuthorityConnector.java Fri Jul 26 09:48:16 2013
@@ -52,7 +52,7 @@ public class JiraAuthorityConnector exte
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
/**
Modified: manifoldcf/branches/release-1.3-branch/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/jira/editConfiguration_jira_server.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.3-branch/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/jira/editConfiguration_jira_server.js?rev=1507239&r1=1507238&r2=1507239&view=diff
==============================================================================
--- manifoldcf/branches/release-1.3-branch/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/jira/editConfiguration_jira_server.js (original)
+++ manifoldcf/branches/release-1.3-branch/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/jira/editConfiguration_jira_server.js Fri Jul 26 09:48:16 2013
@@ -33,7 +33,7 @@ function checkConfig()
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 @@ function checkConfigForSave()
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'))");
Modified: manifoldcf/branches/release-1.3-branch/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_server.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.3-branch/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_server.js?rev=1507239&r1=1507238&r2=1507239&view=diff
==============================================================================
--- manifoldcf/branches/release-1.3-branch/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_server.js (original)
+++ manifoldcf/branches/release-1.3-branch/connectors/jira/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/jira/editConfiguration_jira_server.js Fri Jul 26 09:48:16 2013
@@ -33,7 +33,7 @@ function checkConfig()
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 @@ function checkConfigForSave()
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'))");