Author: kwright
Date: Fri Oct 25 11:18:52 2013
New Revision: 1535691
URL: http://svn.apache.org/r1535691
Log:
Install a check to be sure authority groups have been created before
authorities can be edited
Modified:
manifoldcf/branches/CONNECTORS-792/framework/crawler-ui/src/main/webapp/editauthority.jsp
manifoldcf/branches/CONNECTORS-792/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
manifoldcf/branches/CONNECTORS-792/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
Modified:
manifoldcf/branches/CONNECTORS-792/framework/crawler-ui/src/main/webapp/editauthority.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-792/framework/crawler-ui/src/main/webapp/editauthority.jsp?rev=1535691&r1=1535690&r2=1535691&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-792/framework/crawler-ui/src/main/webapp/editauthority.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-792/framework/crawler-ui/src/main/webapp/editauthority.jsp
Fri Oct 25 11:18:52 2013
@@ -239,6 +239,8 @@
// Get connectors, since this will be needed to determine what to
display.
IResultSet set = connectorManager.getConnectors();
+ // Same for authority groups
+ IAuthorityGroup[] set2 = authGroupManager.getAllGroups();
%>
@@ -250,10 +252,15 @@
<tr><td colspan="2" class="banner"><jsp:include page="banner.jsp"
flush="true"/></td></tr>
<tr><td class="navigation"><jsp:include page="navigation.jsp"
flush="true"/></td>
<td class="darkwindow">
-
-
<%
- if (set.getRowCount() == 0)
+ if (set2.length == 0)
+ {
+%>
+ <p
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.EditAuthorityConnection")%></p>
+ <table class="displaytable"><tr><td
class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.NoAuthorityGroupsDefinedCreateOneFirst")%></td></tr></table>
+<%
+ }
+ else if (set.getRowCount() == 0)
{
%>
<p
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.EditAuthorityConnection")%></p>
@@ -416,7 +423,6 @@
<td
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.AuthorityGroupColon")%></nobr></td>
<td class="value" colspan="4">
<%
- IAuthorityGroup[] set2 = authGroupManager.getAllGroups();
int i = 0;
%>
<select name="authoritygroup" size="1">
Modified:
manifoldcf/branches/CONNECTORS-792/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-792/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties?rev=1535691&r1=1535690&r2=1535691&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-792/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
(original)
+++
manifoldcf/branches/CONNECTORS-792/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
Fri Oct 25 11:18:52 2013
@@ -218,6 +218,7 @@ editauthority.AuthorizationDomainColon=A
editauthority.AuthorityGroupColon=Authority group:
editauthority.SelectAGroup=-- Select a group --
editauthority.ConnectionMustHaveAGroup=Authority connection must have a group
+editauthority.NoAuthorityGroupsDefinedCreateOneFirst=No authority groups have
been defined; create one first
editmapper.ApacheManifoldCFEditMapping=Apache ManifoldCF: Edit Mapping
editmapper.EditAMapping=Edit A Mapping
Modified:
manifoldcf/branches/CONNECTORS-792/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-792/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties?rev=1535691&r1=1535690&r2=1535691&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-792/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
(original)
+++
manifoldcf/branches/CONNECTORS-792/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
Fri Oct 25 11:18:52 2013
@@ -218,6 +218,7 @@ editauthority.AuthorizationDomainColon=A
editauthority.AuthorityGroupColon=Authority group:
editauthority.SelectAGroup=-- Select a group --
editauthority.ConnectionMustHaveAGroup=Authority connection must have a group
+editauthority.NoAuthorityGroupsDefinedCreateOneFirst=No authority groups have
been defined; create one first
editmapper.ApacheManifoldCFEditMapping=Apache ManifoldCFï¼
ãããã³ã°ã®ç·¨é
editmapper.EditAMapping=ãããã³ã°ãç·¨é
