Merge pull request UbuntuEvangelist#305 from bjones86/SAM-2520

SAM-2520 samigo -> event log page doesn't respect sakai.property to hide assessment types
alaminreaz · Mar 17, 2015 · c746552 · c746552
2 parents 0f0cb2a + 3b6abcf
commit c746552
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/samigo/samigo-app/src/webapp/jsf/event/eventLogHeadings.jsp b/samigo/samigo-app/src/webapp/jsf/event/eventLogHeadings.jsp
@@ -8,14 +8,16 @@
        <h:outputText value="#{generalMessages.assessment}" />
        <f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.author.AuthorActionListener" />
     </h:commandLink>
-<f:verbatim></span></li>
-<li role="menuitem" ><span></f:verbatim>
+<f:verbatim></span></li></f:verbatim>
+<h:panelGroup rendered="#{authorization.adminTemplate and template.showAssessmentTypes}">
+<f:verbatim><li role="menuitem" ><span></f:verbatim>
     <h:commandLink title="#{generalMessages.t_template}" action="template" immediate="true" rendered="#{authorization.adminTemplate}">
       <f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.author.TemplateListener" />
       <h:outputText value="#{generalMessages.template}" />
     </h:commandLink>
-<f:verbatim></span></li>
-<li role="menuitem" ><span></f:verbatim>
+<f:verbatim></span></li></f:verbatim>
+</h:panelGroup>
+<f:verbatim><li role="menuitem" ><span></f:verbatim>
     <h:commandLink id="questionPoolsLink" title="#{generalMessages.t_questionPool}" action="poolList" immediate="true" rendered="#{authorization.adminQuestionPool}">
       <h:outputText value="#{generalMessages.questionPool}" />
       <f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.questionpool.QuestionPoolListener" />