Revision: 3635
Author: [email protected]
Date: Wed Jun 23 13:50:03 2010
Log: Fixed the grants editor so that it will remove grants when all
privileges have been set to zero.
http://code.google.com/p/power-architect/source/detail?r=3635
Modified:
/trunk/src/main/java/ca/sqlpower/architect/enterprise/NetworkConflictResolver.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/PrivilegesEditorPanel.java
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/enterprise/NetworkConflictResolver.java
Mon Jun 7 15:17:26 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/enterprise/NetworkConflictResolver.java
Wed Jun 23 13:50:03 2010
@@ -174,7 +174,7 @@
if (upf != null) {
upf.createUserPrompter(
"You do not have sufficient privileges to
perform that action. " +
- "Please hit the refresh button to synchonize
with the server.",
+ "Please hit the refresh button to synchronize
with the server.",
UserPromptType.MESSAGE,
UserPromptOptions.OK,
UserPromptResponse.OK,
@@ -935,7 +935,7 @@
HttpUriRequest request = postRequest;
return outboundHttpClient.execute(request, new
JSONResponseHandler());
} catch (AccessDeniedException ade) {
- throw new AccessDeniedException("Access Denied");
+ throw ade;
} catch (Exception ex) {
throw new RuntimeException("Unable to post json to server:
\n"+ ex.getMessage());
}
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/PrivilegesEditorPanel.java
Tue May 25 13:03:30 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/PrivilegesEditorPanel.java
Wed Jun 23 13:50:03 2010
@@ -160,6 +160,7 @@
&& (getViewPrivilege().isSelected() == false)
&& (getDeletePrivilege().isSelected() == false)
&& (getGrantPrivilege().isSelected() ==
false)) {
+ ((User) groupOrUser).removeGrant(grant);
doesNotRequireSave = true;
}
}
