Changeset 31557

Show
Ignore:
Timestamp:
31.03.2017 18:33:30 (2 years ago)
Author:
ak19
Message:

1. Modifying name of option to turn on usercomments feature to match GS2 name. 2. Correcting wrong default for this feature in java code vs correct one in model colConfigXML.

Location:
main/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/src/org/greenstone/gatherer/cdm/Format4gs3Manager.java

    r31556 r31557  
    111111        String DISPLAY_DEFAULT_FORMAT_TEMP = "" + 
    112112        "<gsf:option name=\"TOC\" value=\"true\"/>" + 
    113         "<gsf:option name=\"UserComments\" value=\"true\"/>" + 
     113        "<gsf:option name=\"AllowUserComments\" value=\"false\"/>" + 
    114114        "<!--" + 
    115115            "Overwriting this template allows you to change the heading of the document." + 
  • main/trunk/greenstone2/collect/modelcol/etc/collectionConfig.xml

    r31556 r31557  
    146146        <format> 
    147147            <gsf:option name="TOC" value="true"/> 
    148             <gsf:option name="UserComments" value="false"/> 
     148            <gsf:option name="AllowUserComments" value="false"/> 
    149149            <!--  
    150150                Overwriting this template allows you to change the heading of the document. 
  • main/trunk/greenstone3/web/interfaces/default/transform/layouts/usercomments.xsl

    r31556 r31557  
    1010 
    1111<xsl:template name="userCommentsSection"> 
    12  <xsl:if test="/page/pageResponse/format[@type='display']/gsf:option[@name='UserComments']/@value='true'"> 
     12 <xsl:if test="/page/pageResponse/format[@type='display']/gsf:option[@name='AllowUserComments']/@value='true'"> 
    1313  <!-- 1. Make some variables available to javascript that the usercomments related js functions need --> 
    1414  <gsf:variable name="d"><xsl:value-of select="/page/pageRequest/paramList/param[@name='d']/@value"/></gsf:variable>