From d5deb7c8fe7504fa1d0ceb780d15c6423ef3a57c Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 17 Sep 2014 05:59:03 +0000 Subject: [PATCH] Fixed two other issues caused by wrong PrintListener usage. git-svn-id: https://svn.libreccm.org/ccm/trunk@2864 8810af33-2d31-482b-a856-94f89814c4df --- .../cms/contenttypes/ui/GenericContactEntryAddForm.java | 5 +++-- .../cms/ui/workflow/WorkflowsOptionPrintListener.java | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEntryAddForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEntryAddForm.java index 0486f307f..fe59f04b6 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEntryAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEntryAddForm.java @@ -37,6 +37,7 @@ import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil; import com.arsdigita.cms.contenttypes.GenericContactEntryKeys; import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.cms.ui.authoring.BasicItemForm; +import com.arsdigita.globalization.GlobalizationHelper; import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.util.UncheckedWrapperException; @@ -86,8 +87,8 @@ public class GenericContactEntryAddForm extends BasicItemForm { "cms.ui.select_one")))); final GenericContactEntryKeys keyList = new GenericContactEntryKeys(); -// keyList.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale() -// .getLanguage()); + keyList.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale() + .getLanguage()); while (keyList.next()) { String currentKey = keyList.getKey(); //target.addOption(new Option(currentKey, keyList.getName())); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowsOptionPrintListener.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowsOptionPrintListener.java index da069aaf6..5dff303f0 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowsOptionPrintListener.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowsOptionPrintListener.java @@ -54,6 +54,7 @@ public class WorkflowsOptionPrintListener implements PrintListener { public void prepare(PrintEvent e) { PageState s = e.getPageState(); OptionGroup w = (OptionGroup) e.getTarget(); + w.clearOptions(); TaskCollection t = getCollection(s); while (t.next()) {