Changeset 661

Show
Ignore:
Timestamp:
06/27/06 14:03:43
Author:
douglm
Message:

Group event owner is an implicit member of the group. Find those groups
when figuring out the group hierarchy for access checks.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/calCore/resources/hbms/AdminGroup.hbm.xml

    r445 r661  
    9393  ]]></query> 
    9494 
     95  <!-- Groups principal is a member of --> 
    9596  <query name="getAdminGroups"><![CDATA[ 
    9697    select ag.grp from org.bedework.calfacade.svc.BwAdminGroupEntry ag 
    9798      where ag.memberId=:entId and ag.memberIsGroup=:isgroup 
     99  ]]></query> 
     100 
     101  <!-- Groups principal is a event owner for --> 
     102  <query name="getAdminGroupsByEventOwner"><![CDATA[ 
     103    from org.bedework.calfacade.svc.BwAdminGroup ag 
     104      where ag.owner=:owner 
    98105  ]]></query> 
    99106 

  • trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/AdminGroupsDbImpl.java

    r520 r661  
    103103    } 
    104104 
    105     return sess.getList(); 
     105    Collection gs = sess.getList(); 
     106 
     107    if (val instanceof BwUser) { 
     108      /* Event owner for group is implicit member of group. */ 
     109 
     110      sess.namedQuery("getAdminGroupsByEventOwner"); 
     111      sess.setEntity("owner", val); 
     112 
     113      gs.addAll(sess.getList()); 
     114    } 
     115 
     116    return gs; 
    106117  } 
    107118