RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug: Configures right ascending sorting in companies list.

Browse source 
* Configures right ascending icon in companies list when it is sorted by company
name (default option).
   * Removes manual wrong sorting in controller and uses the provided by the
   Grid component.
This commit is contained in:
Javier Moran Rua 2012-08-19 12:45:53 +02:00
parent e45fe5cf63
commit 5fd977ffcf
2 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java
View file

@ -34,14 +34,15 @@ import org.libreplan.web.common.BaseCRUDController;
import org.libreplan.web.common.Level; import org.libreplan.web.common.Level;
import org.libreplan.web.common.components.Autocomplete; import org.libreplan.web.common.components.Autocomplete;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
import org.zkoss.zul.Column;
import org.zkoss.zul.Comboitem; import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Textbox; import org.zkoss.zul.Textbox;
/** /**
* Controller for CRUD actions over a {@link User} * Controller for CRUD actions over a {@link User}
*
* @author Jacobo Aragunde Perez <jaragunde@igalia.com> * @author Jacobo Aragunde Perez <jaragunde@igalia.com>
* @author Susana Montes Pedreira <smontes@wirelessgalicia.com> * @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
* @author Javier Moran Rua <jmoran@igalia.com>
*/ */
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class ExternalCompanyCRUDController extends public class ExternalCompanyCRUDController extends
@ -78,6 +79,7 @@ public class ExternalCompanyCRUDController extends
goToEditForm(dto.getCompany()); goToEditForm(dto.getCompany());
} }
@Override
protected void save() throws ValidationException { protected void save() throws ValidationException {
externalCompanyModel.confirmSave(); externalCompanyModel.confirmSave();
} }
@ -134,19 +136,6 @@ public class ExternalCompanyCRUDController extends
ourCompanyPassword.setConstraint(""); ourCompanyPassword.setConstraint("");
} }
public void sortByDefaultByName() {
Column column = (Column) listWindow.getFellowIfAny("columnName");
if (column != null) {
if (column.getSortDirection().equals("ascending")) {
column.sort(false, false);
column.setSortDirection("ascending");
} else if (column.getSortDirection().equals("descending")) {
column.sort(true, false);
column.setSortDirection("descending");
}
}
}
@Override @Override
protected String getEntityType() { protected String getEntityType() {
return _("Company"); return _("Company");

5
libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul
View file

@ -21,10 +21,9 @@
<window id="${arg.top_id}" title="${i18n:_('Companies List')}"> <window id="${arg.top_id}" title="${i18n:_('Companies List')}">
<newdatasortablegrid id="listing" model="@{controller.companiesDTO}" mold="paging" <newdatasortablegrid id="listing" model="@{controller.companiesDTO}" mold="paging"
pageSize="10" sclass="clickable-rows" pageSize="10" sclass="clickable-rows">
onInitRender="controller.sortByDefaultByName();">
<columns sizable="true"> <columns sizable="true">
<newdatasortablecolumn id="columnName" label="${i18n:_('Name')}" sort="auto(lower(name))" sortDirection="descending"/> <newdatasortablecolumn id="columnName" label="${i18n:_('Name')}" sort="auto(lower(name))" sortDirection="ascending"/>
<newdatasortablecolumn label="${i18n:_('Company ID')}" /> <newdatasortablecolumn label="${i18n:_('Company ID')}" />
<newdatasortablecolumn label="${i18n:_('Client')}" /> <newdatasortablecolumn label="${i18n:_('Client')}" />
<newdatasortablecolumn label="${i18n:_('Subcontractor')}" /> <newdatasortablecolumn label="${i18n:_('Subcontractor')}" />