svnno****@sourc*****
svnno****@sourc*****
2007年 7月 20日 (金) 16:55:35 JST
Revision: 322
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=322
Author: shinsuke
Date: 2007-07-20 16:55:34 +0900 (Fri, 20 Jul 2007)
Log Message:
-----------
could not work profiling rule page after updating teeda..
Modified Paths:
--------------
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java
pal-admin/trunk/src/main/resources/appMessages.properties
pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html
-------------- next part --------------
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java 2007-07-20 07:03:52 UTC (rev 321)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java 2007-07-20 07:55:34 UTC (rev 322)
@@ -194,7 +194,7 @@
return null;
}
- public String doAddProfilingRule() {
+ public Class<?> doAddProfilingRule() {
if (getName() == null || getNewLocatorName() == null
|| getNewProfilingRuleName() == null) {
FacesMessageUtil
@@ -223,7 +223,7 @@
return null;
}
- public String doRemoveProfilingRule() {
+ public Class<?> doRemoveProfilingRule() {
try {
getUserManagementService().removePrincipalRulesFromUser(this);
FacesMessageUtil
@@ -259,7 +259,10 @@
}
public boolean isProfilingRulesForUser() {
- return getPrincipalRulesItems().size() > 0;
+ if (getPrincipalRulesItems() != null) {
+ return getPrincipalRulesItems().size() > 0;
+ }
+ return false;
}
}
Modified: pal-admin/trunk/src/main/resources/appMessages.properties
===================================================================
--- pal-admin/trunk/src/main/resources/appMessages.properties 2007-07-20 07:03:52 UTC (rev 321)
+++ pal-admin/trunk/src/main/resources/appMessages.properties 2007-07-20 07:55:34 UTC (rev 322)
@@ -40,8 +40,8 @@
failed.to.add.principalRule.to.user=Failed to add the profiling rule({1}/{2}) to the user({0}).
removed.principalRules.from.user=Removed profiling rules({1}) from the user({0}).
failed.to.remove.principalRules.from.user=Failed to remove profiling rules({1}) from the user({0}).
-invalid.principalRule.or.user.name=Invalid profiling rule or user name.
principalRule.exists.in.user=The profiling rule({1}/{2}) exists in the user({0}).
+invalid.profilingRule.or.user.name=Invalid profiling rule or user name.
invalid.action.for.portlet.application=Invalid action for the portlet application.
started.portlet.application=Started the portlet application.
Modified: pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html 2007-07-20 07:03:52 UTC (rev 321)
+++ pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html 2007-07-20 07:55:34 UTC (rev 322)
@@ -66,7 +66,7 @@
<tr>
<td class="portlet-section-subheader"><label id="profilingRuleLabel">Profiling Rule</label></td>
<td class="portlet-section-body">
- <div id="isProfilingRulesForUser">
+ <div id="isProfilingRulesForUser">
<select id="principalRulesItems" multiple="multiple" size="10" style="width:200px;">
<option>RULE</option>
</select>