Index: .project =================================================================== --- .project (revision 4924) +++ .project (working copy) @@ -1,6 +1,6 @@ - signup-dev_newFeatures + signup Index: tool/src/bundle/messages.properties =================================================================== --- tool/src/bundle/messages.properties (revision 4924) +++ tool/src/bundle/messages.properties (working copy) @@ -102,6 +102,7 @@ event.inProgress=In Progress event.SignupNotRequire=Sign-up Not Req event.unavailable=Full +event.meeting.locked=Sign-up is locked event.youSignedUp=Signed up event.youOnWaitList=On Wait List event.Signup.not.started.yet=Available on Index: tool/src/java/org/sakaiproject/signup/tool/util/Utilities.java =================================================================== --- tool/src/java/org/sakaiproject/signup/tool/util/Utilities.java (revision 4924) +++ tool/src/java/org/sakaiproject/signup/tool/util/Utilities.java (working copy) @@ -384,6 +384,7 @@ } boolean isOnWaitingList = false; + boolean isMeetingSpaceAvail = false; List signupTimeSlots = meeting.getSignupTimeSlots(); for (SignupTimeslot timeslot : signupTimeSlots) { List attendees = timeslot.getAttendees(); @@ -406,11 +407,18 @@ int size = (attendees == null) ? 0 : attendees.size(); if (!isOnWaitingList && isSignupBegin + && !timeslot.isLocked() + && !timeslot.isCanceled() && (size < timeslot.getMaxNoOfAttendees() || timeslot .getMaxNoOfAttendees() == SignupTimeslot.UNLIMITED)) { availableStatus = rb.getString("event.available"); + isMeetingSpaceAvail =true; } } + + if(isMeetingSpaceAvail && meeting.isLocked()){ + availableStatus = rb.getString("event.meeting.locked"); + } return availableStatus; }