Skip to content

Commit

Permalink
Merge pull request sakaiproject#434 from sakaiproject/revert-433-SAM-…
Browse files Browse the repository at this point in the history
…2544

Revert "SAM-2544: Provide better error messaging when selected groups fo...
  • Loading branch information
bjones86 committed Apr 20, 2015
2 parents 6a57d69 + 39a92ff commit 04fc9e4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ entire_site=Entire Site
# bjones86 - OWL-1146
selected_groups=Selected Groups
selected_group=Selected Group
no_selected_groups_error=Students are not able to take this assessment because the groups it was released to have been deleted. You must publish a new copy of this assessment.

header_last_modified=Last Modified
header_last_modified_date=Modified Date
Expand Down
5 changes: 2 additions & 3 deletions samigo/samigo-app/src/webapp/jsf/author/authorIndex.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -410,10 +410,9 @@ $(document).ready(function() {

<t:div rendered="#{publishedAssessment.releaseTo eq 'Selected Groups'}">
<t:div id="groupsHeader" onclick="#{publishedAssessment.groupCount gt 0 ? 'toggleGroups( this );' : ''}" styleClass="#{publishedAssessment.groupCount ge 1 ? 'collapse' : 'alertMessage'}">
<h:outputText value="#{publishedAssessment.groupCount} " rendered ="#{publishedAssessment.releaseTo eq 'Selected Groups' and publishedAssessment.groupCount gt 0}" />
<h:outputText value="#{authorFrontDoorMessages.selected_groups} " rendered="#{publishedAssessment.releaseTo eq 'Selected Groups' and publishedAssessment.groupCount gt 1}"/>
<h:outputText value="#{publishedAssessment.groupCount} " rendered ="#{publishedAssessment.releaseTo eq 'Selected Groups'}" />
<h:outputText value="#{authorFrontDoorMessages.selected_groups} " rendered="#{publishedAssessment.releaseTo eq 'Selected Groups' and (publishedAssessment.groupCount gt 1 or publishedAssessment.groupCount eq 0)}"/>
<h:outputText value="#{authorFrontDoorMessages.selected_group} " rendered="#{publishedAssessment.releaseTo eq 'Selected Groups' and publishedAssessment.groupCount eq 1}"/>
<h:outputText value="#{authorFrontDoorMessages.no_selected_groups_error}" rendered="#{publishedAssessment.releaseTo eq 'Selected Groups' and publishedAssessment.groupCount eq 0}"/>
</t:div>
<t:div id="groupsPanel" style="display: none;">
<t:dataList layout="unorderedList" value="#{publishedAssessment.releaseToGroupsList}" var="group">
Expand Down

0 comments on commit 04fc9e4

Please sign in to comment.