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

Struktur der Bebop-Widgets (Panels) im der FlatBrowsePane des ItemSearchWigets verbessert, FlatBrowsePane funktioniert jetzt wieder mit dem aktuellen Mandalay. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2330 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2013-10-01 11:53:27 +00:00
parent 103a62f012
commit 17bef330e9
2 changed files with 113 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFlatBrowsePane.java
View File

@ -12,6 +12,7 @@ import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.PaginationModelBuilder; import com.arsdigita.bebop.PaginationModelBuilder;
import com.arsdigita.bebop.Paginator; import com.arsdigita.bebop.Paginator;
import com.arsdigita.bebop.RequestLocal; import com.arsdigita.bebop.RequestLocal;
import com.arsdigita.bebop.SimpleContainer;
import com.arsdigita.bebop.Table; import com.arsdigita.bebop.Table;
import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormProcessListener;
@ -37,6 +38,7 @@ import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.Session; import com.arsdigita.persistence.Session;
import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.SessionManager;
import com.arsdigita.toolbox.ui.LayoutPanel;
import com.arsdigita.util.LockableImpl; import com.arsdigita.util.LockableImpl;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
@ -47,7 +49,7 @@ import java.util.List;
* @author Jens Pelzetter <jens@jp-digital.de> * @author Jens Pelzetter <jens@jp-digital.de>
* @version $Id$ * @version $Id$
*/ */
public class ItemSearchFlatBrowsePane extends Form implements FormInitListener, FormProcessListener { public class ItemSearchFlatBrowsePane extends SimpleContainer {
private static final String QUERY_PARAM = "queryStr"; private static final String QUERY_PARAM = "queryStr";
public static final String WIDGET_PARAM = "widget"; public static final String WIDGET_PARAM = "widget";
@ -57,37 +59,47 @@ public class ItemSearchFlatBrowsePane extends Form implements FormInitListener,
private final Paginator paginator; private final Paginator paginator;
private final StringParameter queryParam; private final StringParameter queryParam;
private final List<String> queryFields = new ArrayList<String>(); private final List<String> queryFields = new ArrayList<String>();
private final Submit submit; //private final Submit submit;
private final static CMSConfig CMS_CONFIG = CMSConfig.getInstance(); private final static CMSConfig CMS_CONFIG = CMSConfig.getInstance();
public ItemSearchFlatBrowsePane(final String name) { public ItemSearchFlatBrowsePane() {
super(name); //super(name);
super();
setIdAttr("itemSearchFlatBrowse"); setIdAttr("itemSearchFlatBrowse");
final BoxPanel mainPanel = new BoxPanel(BoxPanel.VERTICAL); //final BoxPanel mainPanel = new BoxPanel(BoxPanel.VERTICAL);
final LayoutPanel mainPanel = new LayoutPanel();
queryParam = new StringParameter(QUERY_PARAM); queryParam = new StringParameter(QUERY_PARAM);
final BoxPanel boxPanel = new BoxPanel(BoxPanel.HORIZONTAL); // final BoxPanel boxPanel = new BoxPanel(BoxPanel.HORIZONTAL);
boxPanel.add(new Label(GlobalizationUtil.globalize("cms.ui.item_search.flat.filter"))); // boxPanel.add(new Label(GlobalizationUtil.globalize("cms.ui.item_search.flat.filter")));
final TextField filter = new TextField(new StringParameter(QUERY_PARAM)); // final TextField filter = new TextField(new StringParameter(QUERY_PARAM));
boxPanel.add(filter); // boxPanel.add(filter);
submit = new Submit(FILTER_SUBMIT, GlobalizationUtil.globalize("cms.ui.item_search.flat.filter.submit")); // submit = new Submit(FILTER_SUBMIT,
boxPanel.add(submit); // GlobalizationUtil.globalize("cms.ui.item_search.flat.filter.submit"));
mainPanel.add(boxPanel); // boxPanel.add(submit);
// mainPanel.add(boxPanel);
//mainPanel.add(new FilterForm());
mainPanel.setLeft(new FilterForm());
resultsTable = new ResultsTable(); resultsTable = new ResultsTable();
paginator = new Paginator((PaginationModelBuilder) resultsTable.getModelBuilder(), paginator = new Paginator((PaginationModelBuilder) resultsTable.getModelBuilder(),
CMS_CONFIG.getItemSearchFlatBrowsePanePageSize()); CMS_CONFIG.getItemSearchFlatBrowsePanePageSize());
mainPanel.add(paginator); //mainPanel.add(paginator);
final BoxPanel body = new BoxPanel(BoxPanel.VERTICAL);
body.add(paginator);
mainPanel.add(resultsTable); //mainPanel.add(resultsTable);
body.add(resultsTable);
mainPanel.setBody(body);
add(mainPanel); add(mainPanel);
addInitListener(this); // addInitListener(this);
addProcessListener(this); // addProcessListener(this);
} }
@Override @Override
@ -96,25 +108,26 @@ public class ItemSearchFlatBrowsePane extends Form implements FormInitListener,
page.addComponentStateParam(this, queryParam); page.addComponentStateParam(this, queryParam);
} }
public void init(final FormSectionEvent fse) throws FormProcessException { // public void init(final FormSectionEvent fse) throws FormProcessException {
final PageState state = fse.getPageState(); // final PageState state = fse.getPageState();
final FormData data = fse.getFormData(); // final FormData data = fse.getFormData();
//
// final String query = (String) data.get(QUERY_PARAM);
// if ((query == null) || query.isEmpty()) {
// data.setParameter(QUERY_PARAM,
// new ParameterData(queryParam, state.getValue(new StringParameter(
// ItemSearchPopup.QUERY))));
// state.setValue(queryParam, data.getParameter(QUERY_PARAM).getValue());
// }
// }
final String query = (String) data.get(QUERY_PARAM); // public void process(final FormSectionEvent fse) throws FormProcessException {
if ((query == null) || query.isEmpty()) { // final FormData data = fse.getFormData();
data.setParameter(QUERY_PARAM, // final PageState state = fse.getPageState();
new ParameterData(queryParam, state.getValue(new StringParameter(ItemSearchPopup.QUERY)))); //
state.setValue(queryParam, data.getParameter(QUERY_PARAM).getValue()); // state.setValue(queryParam, data.get(QUERY_PARAM));
} // state.setValue(new StringParameter(ItemSearchPopup.QUERY), data.get(QUERY_PARAM));
} // }
public void process(final FormSectionEvent fse) throws FormProcessException {
final FormData data = fse.getFormData();
final PageState state = fse.getPageState();
state.setValue(queryParam, data.get(QUERY_PARAM));
state.setValue(new StringParameter(ItemSearchPopup.QUERY), data.get(QUERY_PARAM));
}
public void addQueryField(final String queryField) { public void addQueryField(final String queryField) {
queryFields.add(queryField); queryFields.add(queryField);
@ -133,13 +146,16 @@ public class ItemSearchFlatBrowsePane extends Form implements FormInitListener,
final TableColumnModel columnModel = getColumnModel(); final TableColumnModel columnModel = getColumnModel();
columnModel.add(new TableColumn(0, columnModel.add(new TableColumn(0,
GlobalizationUtil.globalize("cms.ui.item_search.flat.title").localize(), GlobalizationUtil.globalize(
"cms.ui.item_search.flat.title").localize(),
TABLE_COL_TITLE)); TABLE_COL_TITLE));
columnModel.add(new TableColumn(1, columnModel.add(new TableColumn(1,
GlobalizationUtil.globalize("cms.ui.item_search.flat.place").localize(), GlobalizationUtil.globalize(
"cms.ui.item_search.flat.place").localize(),
TABLE_COL_PLACE)); TABLE_COL_PLACE));
columnModel.add(new TableColumn(2, columnModel.add(new TableColumn(2,
GlobalizationUtil.globalize("cms.ui.item_search.flat.type").localize(), GlobalizationUtil.globalize(
"cms.ui.item_search.flat.type").localize(),
TABLE_COL_TYPE)); TABLE_COL_TYPE));
setModelBuilder(new ResultsTableModelBuilder()); setModelBuilder(new ResultsTableModelBuilder());
@ -149,7 +165,8 @@ public class ItemSearchFlatBrowsePane extends Form implements FormInitListener,
} }
private class ResultsTableModelBuilder extends LockableImpl implements TableModelBuilder, PaginationModelBuilder { private class ResultsTableModelBuilder extends LockableImpl implements TableModelBuilder,
PaginationModelBuilder {
//private DataCollection collection; //private DataCollection collection;
private RequestLocal collection = new RequestLocal(); private RequestLocal collection = new RequestLocal();
@ -160,7 +177,8 @@ public class ItemSearchFlatBrowsePane extends Form implements FormInitListener,
query(state); query(state);
} }
((DataCollection) collection.get(state)).setRange(paginator.getFirst(state), paginator.getLast(state) + 1); ((DataCollection) collection.get(state)).setRange(paginator.getFirst(state), paginator.
getLast(state) + 1);
return new ResultsTableModel(table, state, (DataCollection) collection.get(state)); return new ResultsTableModel(table, state, (DataCollection) collection.get(state));
} }
@ -181,7 +199,8 @@ public class ItemSearchFlatBrowsePane extends Form implements FormInitListener,
private void query(final PageState state) { private void query(final PageState state) {
final Session session = SessionManager.getSession(); final Session session = SessionManager.getSession();
final BigDecimal typeId = (BigDecimal) state.getValue(new BigDecimalParameter(ItemSearch.SINGLE_TYPE_PARAM)); final BigDecimal typeId = (BigDecimal) state.getValue(new BigDecimalParameter(
ItemSearch.SINGLE_TYPE_PARAM));
if (typeId == null) { if (typeId == null) {
collection.set(state, session.retrieve(ContentPage.BASE_DATA_OBJECT_TYPE)); collection.set(state, session.retrieve(ContentPage.BASE_DATA_OBJECT_TYPE));
} else { } else {
@ -198,7 +217,8 @@ public class ItemSearchFlatBrowsePane extends Form implements FormInitListener,
ContentItem.NAME, query, ContentItem.NAME, query,
ContentPage.TITLE, query)); ContentPage.TITLE, query));
for (String field : queryFields) { for (String field : queryFields) {
buffer.append(String.format(" or (lower(%s) like lower('%%%s%%'))", field, query)); buffer.append(String.
format(" or (lower(%s) like lower('%%%s%%'))", field, query));
} }
buffer.append(')'); buffer.append(')');
@ -221,7 +241,8 @@ public class ItemSearchFlatBrowsePane extends Form implements FormInitListener,
private final DataCollection collection; private final DataCollection collection;
private ContentItem currentItem; private ContentItem currentItem;
public ResultsTableModel(final Table table, final PageState state, final DataCollection collection) { public ResultsTableModel(final Table table, final PageState state,
final DataCollection collection) {
this.table = table; this.table = table;
this.collection = collection; this.collection = collection;
@ -236,7 +257,8 @@ public class ItemSearchFlatBrowsePane extends Form implements FormInitListener,
boolean ret; boolean ret;
if ((collection != null) && collection.next()) { if ((collection != null) && collection.next()) {
currentItem = (ContentItem) DomainObjectFactory.newInstance(collection.getDataObject()); currentItem = (ContentItem) DomainObjectFactory.newInstance(collection.
getDataObject());
ret = true; ret = true;
} else { } else {
ret = false; ret = false;
@ -308,7 +330,8 @@ public class ItemSearchFlatBrowsePane extends Form implements FormInitListener,
final Link link = new Link(value.toString(), ""); final Link link = new Link(value.toString(), "");
final String widget = (String) state.getValue(new StringParameter(WIDGET_PARAM)); final String widget = (String) state.getValue(new StringParameter(WIDGET_PARAM));
final String searchWidget = (String) state.getValue(new StringParameter(SEARCHWIDGET_PARAM)); final String searchWidget = (String) state.getValue(new StringParameter(
SEARCHWIDGET_PARAM));
final ContentPage page = new ContentPage((BigDecimal) key); final ContentPage page = new ContentPage((BigDecimal) key);
@ -327,8 +350,49 @@ public class ItemSearchFlatBrowsePane extends Form implements FormInitListener,
} }
protected Submit getSubmit() { // protected Submit getSubmit() {
return submit; // return submit;
// }
private class FilterForm extends Form implements FormInitListener, FormProcessListener {
private final Submit submit;
public FilterForm() {
super("ItemSearchFlatBrowsePane");
add(new Label(GlobalizationUtil.globalize("cms.ui.item_search.flat.filter")));
final TextField filter = new TextField(new StringParameter(QUERY_PARAM));
add(filter);
submit = new Submit(FILTER_SUBMIT,
GlobalizationUtil.globalize("cms.ui.item_search.flat.filter.submit"));
add(submit);
addInitListener(this);
addProcessListener(this);
} }
public void init(final FormSectionEvent fse) throws FormProcessException {
final PageState state = fse.getPageState();
final FormData data = fse.getFormData();
final String query = (String) data.get(QUERY_PARAM);
if ((query == null) || query.isEmpty()) {
data.setParameter(QUERY_PARAM,
new ParameterData(queryParam, state.getValue(new StringParameter(
ItemSearchPopup.QUERY))));
state.setValue(queryParam, data.getParameter(QUERY_PARAM).getValue());
}
}
public void process(final FormSectionEvent fse) throws FormProcessException {
final FormData data = fse.getFormData();
final PageState state = fse.getPageState();
state.setValue(queryParam, data.get(QUERY_PARAM));
state.setValue(new StringParameter(ItemSearchPopup.QUERY), data.get(QUERY_PARAM));
}
}
} }

3
ccm-cms/src/com/arsdigita/cms/ui/ItemSearchPage.java
View File

@ -204,7 +204,8 @@ public class ItemSearchPage extends CMSPage {
protected ItemSearchFlatBrowsePane getFlatBrowsePane() { protected ItemSearchFlatBrowsePane getFlatBrowsePane() {
if (m_flatBrowse == null) { if (m_flatBrowse == null) {
m_flatBrowse = new ItemSearchFlatBrowsePane("flatBrowse"); //m_flatBrowse = new ItemSearchFlatBrowsePane("flatBrowse");
m_flatBrowse = new ItemSearchFlatBrowsePane();
} }
return m_flatBrowse; return m_flatBrowse;