[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action ...

[Christian Bauer]

  User: cbauer  
  Date: 07/04/19 14:36:12

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/action    
                        DirectoryHome.java WikiIdentity.java
                        DocumentHome.java UserHome.java
  Log:
  Finalized 'deletion' of stuff with updated FK constraint rules, now required the very latest Hibernate JARs
  
  Revision  Changes    Path
  1.7       +0 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DirectoryHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DirectoryHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DirectoryHome.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- DirectoryHome.java	8 Apr 2007 15:10:32 -0000	1.6
  +++ DirectoryHome.java	19 Apr 2007 18:36:12 -0000	1.7
  @@ -83,7 +83,6 @@
   
       protected boolean prepareRemove() {
           if (getInstance().getParent() == null) return false; // Veto wiki root delete
  -        getNodeDAO().removeChildNodes(getInstance());
           return true;
       }
   
  
  
  
  1.5       +17 -0     jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WikiIdentity.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- WikiIdentity.java	19 Apr 2007 11:27:48 -0000	1.4
  +++ WikiIdentity.java	19 Apr 2007 18:36:12 -0000	1.5
  @@ -54,6 +54,9 @@
           if ("User".equals(name) && "edit".equals(action)) {
               return checkEditUser((User)args[0]);
           } else
  +        if ("User".equals(name) && "delete".equals(action)) {
  +            return checkDeleteUser((User)args[0]);
  +        } else
           if ("User".equals(name) && "editRoles".equals(action)) {
               return checkEditUserRoles((User)args[0]);
           } else
  @@ -166,6 +169,20 @@
       }
   
       /*
  +        Only admins can delete users and some users can't be deleted
  +    */
  +    private boolean checkDeleteUser(User user) {
  +        // Can't delete admin and guest accounts
  +        User adminUser = (User)Component.getInstance("adminUser");
  +        User guestUser = (User)Component.getInstance("guestUser");
  +        if (user.getId().equals(adminUser.getId())) return false;
  +        if (user.getId().equals(guestUser.getId())) return false;
  +
  +        if (currentAccessLevel == UserRoleAccessFactory.ADMINROLE_ACCESSLEVEL) return true;
  +        return false;
  +    }
  +
  +    /*
           Only admins can edit the main menu
       */
       private boolean checkEditMenu(Node node) {
  
  
  
  1.11      +0 -14     jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DocumentHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DocumentHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DocumentHome.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- DocumentHome.java	8 Apr 2007 16:06:49 -0000	1.10
  +++ DocumentHome.java	19 Apr 2007 18:36:12 -0000	1.11
  @@ -96,20 +96,6 @@
           return true;
       }
   
  -    protected boolean beforeRemove() {
  -
  -        // Delete all history nodes
  -        getNodeDAO().removeHistoricalNodes(getInstance());
  -
  -        // Null out default document
  -        removeAsDefaultDocument(getParentDirectory());
  -
  -        // Remove feed entries
  -        feedDAO.removeFeedEntries(getInstance());
  -
  -        return true;
  -    }
  -
       protected void afterNodeMoved(Directory oldParent, Directory newParent) {
           // Update view
           syncFormToInstance(oldParent); // Resolve existing links in old directory
  
  
  
  1.6       +4 -5      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UserHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserHome.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- UserHome.java	4 Apr 2007 10:38:13 -0000	1.5
  +++ UserHome.java	19 Apr 2007 18:36:12 -0000	1.6
  @@ -214,12 +214,11 @@
           return outcome;
       }
   
  +    @Restrict("#{s:hasPermission('User', 'delete', userHome.instance)}")
       public String remove() {
   
  -        // TODO: Not fully implemented
  -
  -        // Remove all role assignments
  -        getInstance().getRoles().clear();
  +        // All nodes created by this user are reset to be created by the admin user
  +        userDAO.resetNodeCreatorToAdmin(getInstance());
   
           return super.remove();
       }