You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by vk...@apache.org on 2009/04/29 16:04:04 UTC
svn commit: r769791 - in
/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets:
admin/ security/ security/users/
Author: vkumar
Date: Wed Apr 29 14:04:03 2009
New Revision: 769791
URL: http://svn.apache.org/viewvc?rev=769791&view=rev
Log:
1) Adding remove button in JetspeedPrincipalManagementPortlet
2) Removing old package structure
Removed:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/admin/
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/users/
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$PrincipalProfilePanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$UserPrincipalProfilePanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$PrincipalProfilePanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet%24PrincipalProfilePanel.html?rev=769791&r1=769790&r2=769791&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$PrincipalProfilePanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$PrincipalProfilePanel.html Wed Apr 29 14:04:03 2009
@@ -23,6 +23,7 @@
<form wicket:id="profileForm">
<input type="checkbox" wicket:id="userStatus" /><span wicket:id="enabledLabel"/>
<input type="submit" wicket:id="submit" />
+ <input type="submit" wicket:id="remove" />
</form>
</wicket:panel>
</html>
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$UserPrincipalProfilePanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet%24UserPrincipalProfilePanel.html?rev=769791&r1=769790&r2=769791&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$UserPrincipalProfilePanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet$UserPrincipalProfilePanel.html Wed Apr 29 14:04:03 2009
@@ -24,6 +24,7 @@
<form wicket:id="profileForm">
<input type="checkbox" wicket:id="userEnabled" /><span wicket:id="enabledLabel"></span>
<input type="submit" wicket:id="submit" />
+ <input type="submit" wicket:id="remove" />
</form>
<br/>
<form wicket:id="userRulesForm">
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java?rev=769791&r1=769790&r2=769791&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java Wed Apr 29 14:04:03 2009
@@ -31,6 +31,7 @@
import org.apache.jetspeed.audit.AuditActivity;
import org.apache.jetspeed.portlets.AdminPortletWebPage;
import org.apache.jetspeed.portlets.wicket.component.CheckBoxPropertyColumn;
+import org.apache.jetspeed.portlets.wicket.component.JavascriptEventConfirmation;
import org.apache.jetspeed.portlets.wicket.component.PortletOddEvenItem;
import org.apache.jetspeed.profiler.rules.PrincipalRule;
import org.apache.jetspeed.profiler.rules.ProfilingRule;
@@ -295,11 +296,16 @@
{
refreshData();
}
- Form profileForm = new Form("profileForm")
- {
-
+ Form profileForm = new Form("profileForm");
+ add(profileForm);
+ profileForm.add(new CheckBox("userEnabled", new PropertyModel(this,
+ "userEnabled")));
+ profileForm.add(new Label("enabledLabel", new ResourceModel(
+ "common.enabled")));
+ profileForm.add(new Button("submit", new ResourceModel(
+ principalParam + ".update.button")){
@Override
- protected void onSubmit()
+ public void onSubmit()
{
try
{
@@ -311,14 +317,26 @@
jSx.printStackTrace();
}
}
- };
- add(profileForm);
- profileForm.add(new CheckBox("userEnabled", new PropertyModel(this,
- "userEnabled")));
- profileForm.add(new Label("enabledLabel", new ResourceModel(
- "common.enabled")));
- profileForm.add(new Button("submit", new ResourceModel(
- principalParam + ".update.button")));
+
+ });
+ profileForm.add(new Button("remove", new ResourceModel(principalParam + ".remove.button")){
+
+ @Override
+ public void onSubmit()
+ {
+ try
+ {
+ getManager().removePrincipal(principal.getName());
+ setPrincipal(null);
+ controlPannels(false);
+ }
+ catch (SecurityException e)
+ {
+ error(e.getMessage());
+ }
+ }
+
+ }.add(new JavascriptEventConfirmation("onclick", "are you sure?")));
Form userRulesForm = new Form("userRulesForm")
{
@@ -821,11 +839,16 @@
protected PrincipalProfilePanel(String id)
{
super(id);
- Form profileForm = new Form("profileForm")
- {
-
+ Form profileForm = new Form("profileForm");
+ add(profileForm);
+ profileForm.add(new CheckBox("userStatus", new PropertyModel(this,
+ "userEnabled")));
+ profileForm.add(new Label("enabledLabel", new ResourceModel(
+ "common.enabled")));
+ profileForm.add(new Button("submit", new ResourceModel(
+ principalParam + ".update.button")){
@Override
- protected void onSubmit()
+ public void onSubmit()
{
JetspeedPrincipal principal = getManager().getPrincipal(
getName());
@@ -836,17 +859,27 @@
setPrincipal(principal);
} catch (SecurityException jSx)
{
- jSx.printStackTrace();
+ error(jSx.getMessage());
}
}
- };
- add(profileForm);
- profileForm.add(new CheckBox("userStatus", new PropertyModel(this,
- "userEnabled")));
- profileForm.add(new Label("enabledLabel", new ResourceModel(
- "common.enabled")));
- profileForm.add(new Button("submit", new ResourceModel(
- principalParam + ".update.button")));
+ });
+ profileForm.add(new Button("remove", new ResourceModel(principalParam + ".remove.button")){
+ @Override
+ public void onSubmit()
+ {
+ try
+ {
+ getManager().removePrincipal(principal.getName());
+ setPrincipal(null);
+ controlPannels(false);
+ }
+ catch (SecurityException e)
+ {
+ error(e.getMessage());
+ }
+ }
+
+ }.add(new JavascriptEventConfirmation("onclick", "are you sure?")));
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org