Wert der Filterbox wird jetzt beim Wechsel des Ordners zurückgesetzt

git-svn-id: https://svn.libreccm.org/ccm/trunk@902 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-05-10 05:38:51 +00:00
parent 444bd95520
commit db6428f17e
1 changed files with 12 additions and 3 deletions

View File

@ -144,7 +144,7 @@ public class FolderManipulator extends SimpleContainer
p.setVisibleDefault(m_filterForm, true); p.setVisibleDefault(m_filterForm, true);
p.addComponentStateParam(this, m_sources); p.addComponentStateParam(this, m_sources);
p.addComponentStateParam(this, m_action); p.addComponentStateParam(this, m_action);
p.addComponentStateParam(this, m_filter); p.addComponentStateParam(this, m_filter);
} }
public final BigDecimal[] getSources(PageState s) { public final BigDecimal[] getSources(PageState s) {
@ -347,7 +347,8 @@ public class FolderManipulator extends SimpleContainer
m_targetSelector.setVisible(s, false); m_targetSelector.setVisible(s, false);
m_targetSelector.reset(s); m_targetSelector.reset(s);
s.setValue(m_action, null); s.setValue(m_action, null);
s.setValue(m_sources, null); s.setValue(m_sources, null);
s.setValue(m_filter, null);
} }
// The form containing the tree to select the target folder from // The form containing the tree to select the target folder from
@ -529,6 +530,7 @@ public class FolderManipulator extends SimpleContainer
private SimpleContainer panel; private SimpleContainer panel;
private boolean visible; private boolean visible;
private FilterFormModelBuilder modelBuilder; private FilterFormModelBuilder modelBuilder;
private TextField filterField;
public FilterForm(FilterFormModelBuilder modelBuilder) { public FilterForm(FilterFormModelBuilder modelBuilder) {
super("folderFilterForm"); super("folderFilterForm");
@ -569,7 +571,8 @@ public class FolderManipulator extends SimpleContainer
} }
panel.add(new Label((String) globalize("cms.ui.folder.filter").localize())); panel.add(new Label((String) globalize("cms.ui.folder.filter").localize()));
panel.add(new TextField(m_filter)); filterField = new TextField(m_filter);
panel.add(filterField);
panel.add( panel.add(
new Submit("filterFolderSubmit", new Submit("filterFolderSubmit",
(String) globalize("cms.ui.folder.filter_do").localize())); (String) globalize("cms.ui.folder.filter_do").localize()));
@ -578,10 +581,16 @@ public class FolderManipulator extends SimpleContainer
} }
public TextField getFilterField() {
return filterField;
}
public void process(FormSectionEvent fse) throws FormProcessException { public void process(FormSectionEvent fse) throws FormProcessException {
} }
public void init(FormSectionEvent fse) throws FormProcessException { public void init(FormSectionEvent fse) throws FormProcessException {
fse.getPageState().setValue(FolderManipulator.this.m_filter, null);
filterField.setValue(fse.getPageState(), null);
} }
public void submitted(FormSectionEvent fse) throws FormProcessException { public void submitted(FormSectionEvent fse) throws FormProcessException {