Author: kwright
Date: Fri Oct 25 13:59:49 2013
New Revision: 1535737
URL: http://svn.apache.org/r1535737
Log:
Add domain pulldown
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=1535737&r1=1535736&r2=1535737&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 13:59:49 2013
@@ -28,6 +28,8 @@
// the connection object being edited will be placed in the thread context
under the name "ConnectionObject".
try
{
+ // Get the domain manager handle
+ IAuthorizationDomainManager domainMgr =
AuthorizationDomainManagerFactory.make(threadContext);
// Get the connection manager handle
IAuthorityConnectionManager connMgr =
AuthorityConnectionManagerFactory.make(threadContext);
// Also get the list of available connectors
@@ -365,6 +367,7 @@
// "Type" tab
if
(tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Type")))
{
+ IResultSet domainSet = domainMgr.getDomains();
%>
<table class="displaytable">
<tr><td class="separator" colspan="5"><hr/></td></tr>
@@ -417,16 +420,13 @@
<tr><td class="separator" colspan="5"><hr/></td></tr>
<tr>
<td
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.AuthorityGroupColon")%></nobr></td>
- <td class="value" colspan="4">
-<%
- int i = 0;
-%>
+ <td class="value" colspan="1">
<select name="authoritygroup" size="1">
<option
value=""><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.SelectAGroup")%></option>
<%
- while (i < set2.length)
+ for (int i = 0; i < set2.length; i++)
{
- IAuthorityGroup row = set2[i++];
+ IAuthorityGroup row = set2[i];
String thisAuthorityName = row.getName();
String thisDescription = row.getDescription();
if (thisDescription == null || thisDescription.length() == 0)
@@ -439,10 +439,26 @@
%>
</select>
</td>
- </tr>
- <tr>
<td
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.AuthorizationDomainColon")%></nobr></td>
- <td class="value" colspan="4"><nobr><input
type="text" name="authdomain" size="40"
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(authDomain)%>'/></nobr></td>
+ <td class="value" colspan="1">
+ <select name="authdomain" size="1">
+ <option value="" <%=(authDomain
== null || authDomain.length() ==
0)?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.DefaultDomainNone")%></option>
+<%
+ for (int i = 0; i < domainSet.getRowCount(); i++)
+ {
+ IResultRow row = domainSet.getRow(i);
+ String domainName = (String)row.getValue("domainname");
+ String thisDescription = (String)row.getValue("description");
+ if (thisDescription == null || thisDescription.length() == 0)
+ thisDescription = domainName;
+%>
+ <option
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(domainName)%>'
+ <%=(authDomain!=null &&
domainName.equals(authDomain))?"selected=\"selected\"":""%>><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(thisDescription)%></option>
+<%
+ }
+%>
+ </select>
+ </td>
</tr>
</table>
<%
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=1535737&r1=1535736&r2=1535737&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 13:59:49 2013
@@ -216,9 +216,10 @@ editauthority.PrerequisiteUserMappingCol
editauthority.NoPrerequisites=(No Prerequisites)
editauthority.AuthorizationDomainColon=Authorization domain:
editauthority.AuthorityGroupColon=Authority group:
-editauthority.SelectAGroup=-- Select a 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
+editauthority.DefaultDomainNone=Default domain (None)
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=1535737&r1=1535736&r2=1535737&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 13:59:49 2013
@@ -216,9 +216,10 @@ editauthority.PrerequisiteUserMappingCol
editauthority.NoPrerequisites=ï¼æ¡ä»¶ç¡ãï¼
editauthority.AuthorizationDomainColon=Authorization domain:
editauthority.AuthorityGroupColon=Authority group:
-editauthority.SelectAGroup=-- Select a 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
+editauthority.DefaultDomainNone=Default domain (None)
editmapper.ApacheManifoldCFEditMapping=Apache ManifoldCFï¼
ãããã³ã°ã®ç·¨é
editmapper.EditAMapping=ãããã³ã°ãç·¨é
