manveen 02/05/03 00:16:58 Modified: webapps/admin/realm jdbcRealm.jsp jndiRealm.jsp memoryRealm.jsp userDatabaseRealm.jsp Log: Add a check if the realm can be deleted or not. Revision Changes Path 1.4 +4 -1 jakarta-tomcat-4.0/webapps/admin/realm/jdbcRealm.jsp Index: jdbcRealm.jsp =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/jdbcRealm.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jdbcRealm.jsp 24 Mar 2002 04:13:24 -0000 1.3 +++ jdbcRealm.jsp 3 May 2002 07:16:58 -0000 1.4 @@ -23,6 +23,7 @@ <html:hidden property="adminAction"/> <html:hidden property="parentObjectName"/> <html:hidden property="objectName"/> + <html:hidden property="allowDeletion"/> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr bgcolor="7171A5"> @@ -42,10 +43,12 @@ <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action> <controls:action> --------------------------------- </controls:action> <logic:notEqual name="jdbcRealmForm" property="adminAction" value="Create"> + <logic:notEqual name="userDatabaseRealmForm" property="allowDeletion" value="false"> <controls:action url='<%= "/DeleteRealm.do?select=" + URLEncoder.encode(thisObjectName) %>'> <bean:message key="actions.realms.delete"/> - </controls:action> + </controls:action> + </logic:notEqual> </logic:notEqual> </controls:actions> </div> 1.4 +4 -1 jakarta-tomcat-4.0/webapps/admin/realm/jndiRealm.jsp Index: jndiRealm.jsp =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/jndiRealm.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jndiRealm.jsp 24 Mar 2002 04:13:24 -0000 1.3 +++ jndiRealm.jsp 3 May 2002 07:16:58 -0000 1.4 @@ -22,6 +22,7 @@ <html:hidden property="adminAction"/> <html:hidden property="objectName"/> <html:hidden property="parentObjectName"/> + <html:hidden property="allowDeletion"/> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr bgcolor="7171A5"> @@ -41,11 +42,13 @@ <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action> <controls:action> --------------------------------- </controls:action> <logic:notEqual name="jndiRealmForm" property="adminAction" value="Create"> + <logic:notEqual name="userDatabaseRealmForm" property="allowDeletion" value="false"> <controls:action url='<%= "/DeleteRealm.do?select=" + URLEncoder.encode(thisObjectName) %>'> <bean:message key="actions.realms.delete"/> </controls:action> - </logic:notEqual> + </logic:notEqual> + </logic:notEqual> </controls:actions> </div> </td> 1.4 +3 -0 jakarta-tomcat-4.0/webapps/admin/realm/memoryRealm.jsp Index: memoryRealm.jsp =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/memoryRealm.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- memoryRealm.jsp 24 Mar 2002 04:13:24 -0000 1.3 +++ memoryRealm.jsp 3 May 2002 07:16:58 -0000 1.4 @@ -23,6 +23,7 @@ <html:hidden property="parentObjectName"/> <html:hidden property="adminAction"/> <html:hidden property="objectName"/> + <html:hidden property="allowDeletion"/> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr bgcolor="7171A5"> @@ -42,10 +43,12 @@ <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action> <controls:action> --------------------------------- </controls:action> <logic:notEqual name="memoryRealmForm" property="adminAction" value="Create"> + <logic:notEqual name="userDatabaseRealmForm" property="allowDeletion" value="false"> <controls:action url='<%= "/DeleteRealm.do?select=" + URLEncoder.encode(thisObjectName) %>'> <bean:message key="actions.realms.delete"/> </controls:action> + </logic:notEqual> </logic:notEqual> </controls:actions> </div> 1.4 +4 -1 jakarta-tomcat-4.0/webapps/admin/realm/userDatabaseRealm.jsp Index: userDatabaseRealm.jsp =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/userDatabaseRealm.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- userDatabaseRealm.jsp 24 Mar 2002 04:13:24 -0000 1.3 +++ userDatabaseRealm.jsp 3 May 2002 07:16:58 -0000 1.4 @@ -23,6 +23,7 @@ <html:hidden property="parentObjectName"/> <html:hidden property="adminAction"/> <html:hidden property="objectName"/> + <html:hidden property="allowDeletion"/> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr bgcolor="7171A5"> @@ -41,11 +42,13 @@ <controls:actions> <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action> <controls:action> --------------------------------- </controls:action> - <logic:notEqual name="userDatabaseRealmForm" property="adminAction" value="Create"> + <logic:notEqual name="userDatabaseRealmForm" property="adminAction" value="Create"> + <logic:notEqual name="userDatabaseRealmForm" property="allowDeletion" value="false"> <controls:action url='<%= "/DeleteRealm.do?select=" + URLEncoder.encode(thisObjectName) %>'> <bean:message key="actions.realms.delete"/> </controls:action> + </logic:notEqual> </logic:notEqual> </controls:actions> </div>
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>