Changeset 20463

Show
Ignore:
Timestamp:
02/24/10 08:41:41 (5 months ago)
Author:
umesha
Message:

added feature for selecting creator as a default participant

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/core/src/net/project/notification/SubscriptionBean.java

    r20443 r20463  
    3939import net.project.security.group.GroupException; 
    4040import net.project.security.group.GroupTypeID; 
     41import net.project.security.group.PrincipalGroup; 
    4142import net.project.space.Space; 
    4243import net.project.space.SpaceFactory; 
    …… 
    105106 
    106107        try { 
    107             if (this.space != null) { 
    108                 groupList.setSpace(space); 
    109             } else if (this.spaceID != null) { 
    110                 Space space = SpaceFactory.constructSpaceFromID(this.spaceID); 
    111                 groupList.setSpace(space); 
    112             } else if (spaceID != null) { 
     108 
     109                        if (spaceID != null) { 
    113110                Space space = SpaceFactory.constructSpaceFromID(spaceID); 
    114111                groupList.setSpace(space); 
    …… 
    127124                participants.append("<td nowrap>"); 
    128125 
    129                 if (checkForSubscribers(group.getID())) { 
    130                     participants.append("<input type=checkbox checked name='teamMembers' value=\"" + group.getID() + "\">" + 
     126                               if (group.isPrincipal() && ((PrincipalGroup) group).getOwnerID().equals(user.getID())){ 
     127                    participants.append("<input type=checkbox checked=checked name='teamMembers' value=\"" + group.getID() + "\">" + 
    131128                                HTMLUtils.escape(display) + "\n"); 
    132129                } else { 

  • trunk/core/src/net/project/security/group/GroupCollection.java

    r20378 r20463  
    590590        // Query to load groups by space for a specific space and order by display name 
    591591        query.append(GroupDAO.getQueryLoadSpaceGroups()); 
    592         query.append(" and shg.space_id = ? "); 
     592        query.append(" and is_owner = 1 and shg.space_id = ? "); 
    593593        bindVariables.add(this.currentSpace.getID()); 
    594594        if(isOrderBySort){