LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfixes for DecisionTree: 

- None option was missing for the target section select box
- Fixed old Mandalay stylesheet (only for testing)


git-svn-id: https://svn.libreccm.org/ccm/trunk@3005 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2014-12-05 09:12:25 +00:00
parent ea9119bb15
commit 15d742c003
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ccm-cms-types-decisiontree/src/com/arsdigita/cms/contenttypes/ui/DecisionTreeTargetEditForm.java
View File

@ -179,6 +179,12 @@ public class DecisionTreeTargetEditForm extends Form
target.clearOptions(); target.clearOptions();
DecisionTree tree = (DecisionTree) m_selTree.getSelectedObject(state); DecisionTree tree = (DecisionTree) m_selTree.getSelectedObject(state);
Option none = new Option(
"",
new Label(DecisionTreeGlobalizationUtil.globalize(
"cms.contenttypes.ui.decisiontree.targets.form.none")));
target.addOption(none);
if (tree != null) { if (tree != null) {
DecisionTreeSectionCollection sections = tree.getSections(); DecisionTreeSectionCollection sections = tree.getSections();
if (sections != null) { if (sections != null) {
@ -252,10 +258,10 @@ public class DecisionTreeTargetEditForm extends Form
"", "",
new Label(DecisionTreeGlobalizationUtil.globalize( new Label(DecisionTreeGlobalizationUtil.globalize(
"cms.contenttypes.ui.decisiontree.targets.form.please_select"))); "cms.contenttypes.ui.decisiontree.targets.form.please_select")));
Option none = new Option( // Option none = new Option(
"", // "",
new Label(DecisionTreeGlobalizationUtil.globalize( // new Label(DecisionTreeGlobalizationUtil.globalize(
"cms.contenttypes.ui.decisiontree.targets.form.none"))); // "cms.contenttypes.ui.decisiontree.targets.form.none")));
// add(new Label(DecisionTreeGlobalizationUtil.globalize( // add(new Label(DecisionTreeGlobalizationUtil.globalize(
// "cms.contenttypes.ui.decisiontree.targets.form.match_value"))); // "cms.contenttypes.ui.decisiontree.targets.form.match_value")));
@ -289,7 +295,7 @@ public class DecisionTreeTargetEditForm extends Form
m_targetSectionWidget = new SingleSelect(TARGET_SECTION); m_targetSectionWidget = new SingleSelect(TARGET_SECTION);
m_targetSectionWidget.setLabel(DecisionTreeGlobalizationUtil.globalize( m_targetSectionWidget.setLabel(DecisionTreeGlobalizationUtil.globalize(
"cms.contenttypes.ui.decisiontree.targets.form.target_section_label")); "cms.contenttypes.ui.decisiontree.targets.form.target_section_label"));
m_targetSectionWidget.addOption(none); // m_targetSectionWidget.addOption(none);
try { try {
m_targetSectionWidget.addPrintListener(new PrintListener() { m_targetSectionWidget.addPrintListener(new PrintListener() {
@Override @Override

2
ccm-sci-bundle/web/themes/mandalay/user/includes/types.xsl
View File

@ -49,7 +49,7 @@
<xsl:import href="types/SciProject.xsl"/> <xsl:import href="types/SciProject.xsl"/>
<xsl:import href="types/SciPublications.xsl"/> <xsl:import href="types/SciPublications.xsl"/>
<xsl:import href="types/Organization.xsl"/> <xsl:import href="types/Organization.xsl"/>
<xsl:import href="types/SiteProxy.xsl"/> <!--<xsl:import href="types/SiteProxy.xsl"/>-->
<xsl:import href="types/sci-common.xsl"/> <xsl:import href="types/sci-common.xsl"/>
</xsl:stylesheet> </xsl:stylesheet>

4
ccm-sci-bundle/web/themes/mandalay/user/includes/types/DecisionTree/DecisionTree.xsl
View File

@ -114,9 +114,9 @@
<xsl:value-of select="./sections/instructions"/> <xsl:value-of select="./sections/instructions"/>
</div> </div>
<script type="text/javascript" <script type="text/javascript"
src="/templates/ccm-cms-types-decisiontree/forms.js"/> src="{$context-prefix}/templates/ccm-cms-types-decisiontree/forms.js"/>
<form method="get" <form method="get"
action="/templates/ccm-cms-types-decisiontree/form-handler.jsp"> action="{$context-prefix}/templates/ccm-cms-types-decisiontree/form-handler.jsp">
<div> <div>
<input name="section_oid" <input name="section_oid"
type="hidden"> type="hidden">