svnno****@sourc*****
svnno****@sourc*****
2008年 7月 31日 (木) 15:39:54 JST
Revision: 1065
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1065
Author: shinsuke
Date: 2008-07-31 15:39:54 +0900 (Thu, 31 Jul 2008)
Log Message:
-----------
passed name when clicking a back button.
Modified Paths:
--------------
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java
pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html
pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html
-------------- next part --------------
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java 2008-07-31 06:09:27 UTC (rev 1064)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java 2008-07-31 06:39:54 UTC (rev 1065)
@@ -64,6 +64,11 @@
return null;
}
+ public Class<?> doBack() {
+ setCrudType(CrudType.READ);
+ return UserAttributeListPage.class;
+ }
+
@TakeOver(type = TakeOverType.INCLUDE, properties = "name")
public Class<?> doUpdate() {
@@ -120,8 +125,8 @@
* @see jp.sf.pal.admin.web.user.AbstractUserAttributePage#setKey(java.lang.String)
*/
@Override
- @Required
- @Length(maximum = 255)
+ @Required(target = "doConfirm")
+ @Length(maximum = 255, target = "doConfirm")
public void setKey(String key) {
super.setKey(key);
}
@@ -130,12 +135,12 @@
* @see jp.sf.pal.admin.web.user.AbstractUserAttributePage#setValue(java.lang.String)
*/
@Override
- @Length(maximum = 255)
+ @Length(maximum = 255, target = "doConfirm")
public void setValue(String value) {
super.setValue(value);
}
- public String getJumpUserAttributeListValue() {
+ public String getDoBackValue() {
return getLabelHelper().getLabelValue("back");
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java 2008-07-31 06:09:27 UTC (rev 1064)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java 2008-07-31 06:39:54 UTC (rev 1065)
@@ -61,16 +61,20 @@
return null;
}
- // public Class<?> doBack() {
- // setCrudType(CrudType.READ);
- // return UserAttributeListPage.class;
- // }
+ public Class<?> doBack() {
+ setCrudType(CrudType.READ);
+ return UserAttributeListPage.class;
+ }
- public String getJumpUserAttributeListValue() {
+ public Class<?> doConfirm() {
+ return UserAttributeConfirmPage.class;
+ }
+
+ public String getDoBackValue() {
return getLabelHelper().getLabelValue("back");
}
- public String getGoUserAttributeConfirmValue() {
+ public String getDoConfirmValue() {
return getLabelHelper().getLabelValue("confirm");
}
@@ -78,8 +82,8 @@
* @see jp.sf.pal.admin.web.user.AbstractUserAttributePage#setKey(java.lang.String)
*/
@Override
- @Required
- @Length(maximum = 255)
+ @Required(target = "doConfirm")
+ @Length(maximum = 255, target = "doConfirm")
public void setKey(String key) {
super.setKey(key);
}
@@ -88,7 +92,7 @@
* @see jp.sf.pal.admin.web.user.AbstractUserAttributePage#setValue(java.lang.String)
*/
@Override
- @Length(maximum = 255)
+ @Length(maximum = 255, target = "doConfirm")
public void setValue(String value) {
super.setValue(value);
}
Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html 2008-07-31 06:09:27 UTC (rev 1064)
+++ pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html 2008-07-31 06:39:54 UTC (rev 1065)
@@ -57,7 +57,7 @@
<input type="hidden" id="name-hidden" />
<div>
- <input type="button" id="jumpUserAttributeList" value="Back"
+ <input type="button" id="doBack" value="Back"
onclick="location.href='userAttributeList.html'" class="portlet-form-button"/>
<div id="isNotRead" style="display:inline;">
<input type="button" id="doUpdate" value="Finish" onclick="location.href='userAttributeList.html'" class="portlet-form-button"/>
Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html 2008-07-31 06:09:27 UTC (rev 1064)
+++ pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html 2008-07-31 06:39:54 UTC (rev 1065)
@@ -60,10 +60,10 @@
<input type="hidden" id="name-hidden"/>
<div>
- <input type="button" id="jumpUserAttributeList" value="Back"
+ <input type="button" id="doBack" value="Back"
onclick="location.href='userAttributeList.html'" class="portlet-form-button"/>
<div id="isNotRead" style="display:inline;">
- <input type="button" id="goUserAttributeConfirm" value="Confirm"
+ <input type="button" id="doConfirm" value="Confirm"
onclick="location.href='userAttributeConfirm.html'" class="portlet-form-button"/>
</div>
</div>