- Lokaliserung der Labels von ccm-sci-types-project

- Korrekturen an GenericOrganizationalUnit


git-svn-id: https://svn.libreccm.org/ccm/trunk@1185 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-10-21 09:29:36 +00:00
parent e92325b459
commit ac9142335e
16 changed files with 134 additions and 74 deletions

View File

@ -84,7 +84,7 @@ association {
//Additonal attributes for the assoication
//Optional string for *internal* data
String[0..n] assocType = cms_organizationalunits_hierarchy_map.assoc_type VARCHAR(128);
String[0..1] assocType = cms_organizationalunits_hierarchy_map.assoc_type VARCHAR(128);
//Integers for sorting
Integer[0..1] superiorOrgaUnitOrder = cms_organizationalunits_hierarchy_map.superior_orgaunit_order INTEGER;
Integer[0..1] subordinateOrgaUnitOrder = cms_organizationalunits_hierarchy_map.subordinate_orgaunit_order INTEGER;

View File

@ -170,20 +170,23 @@ public class GenericOrganizationalUnit extends ContentPage {
assocType);
link.set(
GenericOrganizationalUnitSuperiorCollection.SUPERIOR_ORGAUNIT_ORDER,
getSuperiorOrgaUnits().size());
(int) getSuperiorOrgaUnits().size());
link.set(
GenericOrganizationalUnitSubordinateCollection.SUBORDINATE_ORGAUNIT_ORDER,
((int) getSubordinateOrgaUnits().size()) + 1);
link.save();
}
public void addSuperiorOrgaUnit(final GenericOrganizationalUnit orgaunit) {
addSuperiorOrgaUnit(orgaunit, "");
}
public void removeSuperiorOrgaUnit(
final GenericOrganizationalUnit orgaunit) {
Assert.exists(orgaunit, GenericOrganizationalUnit.class);
remove(SUPERIOR_ORGAUNITS, orgaunit);
}
public boolean hasSuperiorOrgaUnits() {
return !getSuperiorOrgaUnits().isEmpty();
}
@ -218,23 +221,25 @@ public class GenericOrganizationalUnit extends ContentPage {
final DataObject link = add(SUBORDINATE_ORGAUNITS, orgaunit);
link.set(GenericOrganizationalUnitSubordinateCollection.ASSOCTYPE,
assocType);
assocType);
link.set(
GenericOrganizationalUnitSubordinateCollection.SUBORDINATE_ORGAUNIT_ORDER,
getSubordinateOrgaUnits().size());
(int) getSubordinateOrgaUnits().size());
link.set(GenericOrganizationalUnitSuperiorCollection.SUPERIOR_ORGAUNIT_ORDER,
((int) getSuperiorOrgaUnits().size()) + 1);
link.save();
}
public void addSubordinateOrgaUnit(final GenericOrganizationalUnit orgaunit) {
addSubordinateOrgaUnit(orgaunit, "");
}
public void removeSubordinateOrgaUnit(
public void addSubordinateOrgaUnit(final GenericOrganizationalUnit orgaunit) {
addSubordinateOrgaUnit(orgaunit, "");
}
public void removeSubordinateOrgaUnit(
final GenericOrganizationalUnit orgaunit) {
Assert.exists(orgaunit, GenericOrganizationalUnit.class);
remove(SUBORDINATE_ORGAUNITS, orgaunit);
}
public boolean hasSubordinateOrgaUnits() {
return !getSubordinateOrgaUnits().isEmpty();
}

View File

@ -4,9 +4,11 @@ import com.arsdigita.cms.ContentItem;
import com.arsdigita.cms.ContentPage;
import com.arsdigita.domain.DomainCollection;
import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.kernel.ACSObject;
import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.OID;
import java.math.BigDecimal;
/**
*
@ -25,7 +27,7 @@ public class GenericOrganizationalUnitSubordinateCollection extends DomainCollec
public GenericOrganizationalUnitSubordinateCollection(
final DataCollection dataCollection) {
super(dataCollection);
m_dataCollection.addOrder(SUBORDINATE_ORGAUNIT_ORDER + " asc");
m_dataCollection.addOrder(LINK_SUBORDINATE_ORGAUNIT_ORDER + " asc");
}
public String getAssocType() {
@ -130,7 +132,11 @@ public class GenericOrganizationalUnitSubordinateCollection extends DomainCollec
return (GenericOrganizationalUnit) DomainObjectFactory.newInstance(m_dataCollection.
getDataObject());
}
public BigDecimal getId() {
return (BigDecimal) m_dataCollection.getDataObject().get(ACSObject.ID);
}
public OID getOID() {
return m_dataCollection.getDataObject().getOID();
}

View File

@ -25,7 +25,7 @@ public class GenericOrganizationalUnitSuperiorCollection extends DomainCollectio
public GenericOrganizationalUnitSuperiorCollection(
final DataCollection dataCollection) {
super(dataCollection);
m_dataCollection.addOrder(SUPERIOR_ORGAUNIT_ORDER + " asc");
m_dataCollection.addOrder(LINK_SUPERIOR_ORGAUNIT_ORDER + " asc");
}
public String getAssocType() {

View File

@ -23,6 +23,7 @@ import com.arsdigita.cms.dispatcher.Utilities;
import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.persistence.OID;
import com.arsdigita.util.LockableImpl;
import java.math.BigDecimal;
import org.apache.log4j.Logger;
/**
@ -118,9 +119,9 @@ public class GenericOrganizationalUnitSubordinateOrgaUnitsTable
subordinateOrgaUnits = orgaunit.getSubordinateOrgaUnits();
if ((customizer.getAssocType() != null)
&& !(customizer.getAssocType().isEmpty())) {
subordinateOrgaUnits.addFilter(String.format("assocType = '%s",
customizer.
getAssocType()));
subordinateOrgaUnits.addFilter(String.format(
"link.assocType = '%s'",
customizer.getAssocType()));
}
this.customizer = customizer;
}
@ -161,7 +162,7 @@ public class GenericOrganizationalUnitSubordinateOrgaUnitsTable
@Override
public Object getKeyAt(final int columnIndex) {
return subordinateOrgaUnits.getOID();
return subordinateOrgaUnits.getId();
}
}
@ -180,8 +181,8 @@ public class GenericOrganizationalUnitSubordinateOrgaUnitsTable
final com.arsdigita.cms.SecurityManager securityManager = Utilities.
getSecurityManager(state);
final GenericOrganizationalUnit subordinateOrgaUnit =
(GenericOrganizationalUnit) DomainObjectFactory.
newInstance((OID) key);
new GenericOrganizationalUnit(
(BigDecimal) key);
final boolean canEdit = securityManager.canAccess(
state.getRequest(),
@ -301,7 +302,7 @@ public class GenericOrganizationalUnitSubordinateOrgaUnitsTable
}
}
}
private class ActionListener implements TableActionListener {
@Override
@ -313,8 +314,8 @@ public class GenericOrganizationalUnitSubordinateOrgaUnitsTable
getSelectedObject(
state);
final GenericOrganizationalUnit subOrgaUnit =
(GenericOrganizationalUnit) DomainObjectFactory.
newInstance((OID) event.getRowKey());
new GenericOrganizationalUnit(
new BigDecimal((String)event.getRowKey()));
final GenericOrganizationalUnitSubordinateCollection subOrgaUnits =
orgaunit.
getSubordinateOrgaUnits();

View File

@ -67,7 +67,7 @@ public class GenericOrganizationalUnitSuperiorOrgaUnitAddForm
ITEM_SEARCH);
supOrgaUnit = (GenericOrganizationalUnit) supOrgaUnit.getContentBundle().getInstance(orgaunit.getLanguage(), true);
orgaunit.addSuperiorOrgaUnit(orgaunit, customizer.getAssocType());
orgaunit.addSuperiorOrgaUnit(supOrgaUnit, customizer.getAssocType());
}
init(fse);

View File

@ -107,7 +107,7 @@ public class GenericOrganizationalUnitSuperiorOrgaUnitsTable extends Table {
superiorOrgaUnits = orgaunit.getSuperiorOrgaUnits();
if ((customizer.getAssocType() != null)
&& !(customizer.getAssocType().isEmpty())) {
superiorOrgaUnits.addFilter(String.format("assocType = '%s",
superiorOrgaUnits.addFilter(String.format("link.assocType = '%s'",
customizer.
getAssocType()));
}
@ -297,7 +297,7 @@ public class GenericOrganizationalUnitSuperiorOrgaUnitsTable extends Table {
getSelectedObject(state);
final GenericOrganizationalUnit supOrgaUnit =
(GenericOrganizationalUnit) DomainObjectFactory.
newInstance((OID) event.getRowKey());
newInstance(OID.valueOf((String)event.getRowKey()));
final GenericOrganizationalUnitSuperiorCollection supOrgaUnits =
orgaunit.
getSuperiorOrgaUnits();

View File

@ -14,7 +14,7 @@
<ctd:authoring-step
labelKey="sciorganization.ui.project_properties.title"
labelBundle="com.arsdigita.cms.contenttypes.ui.SciOrganizationResources"
labelBundle="com.arsdigita.cms.contenttypes.ui.SciProjectResources"
descriptionKey="sciorganization.ui.project_properties.title"
descriptionBundle="com.arsdigita.cms.contenttypes.ui.SciProjectResources"
component="com.arsdigita.cms.contenttypes.ui.SciProjectPropertiesStep"
@ -22,14 +22,14 @@
<ctd:authoring-step
labelKey="sciorganization.ui.project.members"
labelBundle="com.arsdigita.cms.contenttypes.ui.SciOrganizationResources"
labelBundle="com.arsdigita.cms.contenttypes.ui.SciProjectResources"
descriptionKey="sciorganization.ui.project.members.description"
component="com.arsdigita.cms.contenttypes.ui.SciProjectMembersStep"
ordering="2"/>
<ctd:authoring-step
labelKey="sciorganization.ui.project_description.title"
labelBundle="com.arsdigita.cms.contenttypes.ui.SciOrganizationResources"
labelBundle="com.arsdigita.cms.contenttypes.ui.SciProjectResources"
descriptionKey="sciorganization.ui.project_description.title"
component="com.arsdigita.cms.contenttypes.ui.SciProjectDescriptionStep"
ordering="3"/>

View File

@ -32,13 +32,13 @@ public class SciProjectConfig extends AbstractConfig {
new BooleanParameter(
"com.arsdigita.cms.contenttypes.sciproject.enable_sub_projects_step",
Parameter.REQUIRED,
Boolean.FALSE);
Boolean.TRUE);
enableSuperProjectsStep =
new BooleanParameter(
"com.arsdigita.cms.contenttypes.sciproject.enable_super_projects_step",
Parameter.REQUIRED,
Boolean.FALSE);
Boolean.TRUE);
shortDescMaxLength = new IntegerParameter(
"com.arsdigita.cms.contenttypes.sciproject.shortdesc.max_length",

View File

@ -37,7 +37,7 @@ public class SciProjectDescriptionEditForm
@Override
protected void addWidgets() {
add(new Label(SciProjectGlobalizationUtil.globalize(
"sciorganization.ui.project.description")));
"sciproject.ui.description")));
final ParameterModel descParam = new StringParameter(
SciProject.PROJECT_DESCRIPTION);
final TextArea desc;
@ -68,7 +68,7 @@ public class SciProjectDescriptionEditForm
if (config.getEnableFundingVolume()) {
add(new Label(SciProjectGlobalizationUtil.globalize(
"sciproject.ui.funding_volume")));
"sciproject.ui.funding.volume")));
final ParameterModel fundingVolumeParam = new StringParameter(
SciProject.FUNDING_VOLUME);
final TextField fundingVolume = new TextField(fundingVolumeParam);

View File

@ -33,7 +33,7 @@ public class SciProjectDescriptionStep extends SimpleEditStep {
new SciProjectDescriptionEditForm(itemModel);
add(EDIT_PROJECT_DESC_SHEET_NAME,
(String) SciProjectGlobalizationUtil.globalize(
"sciproject.ui.edit_desc").localize(),
"sciproject.ui.desc.edit").localize(),
new WorkflowLockedComponentAccess(editDescForm, itemModel),
editDescForm.getSaveCancelSection().getCancelButton());
@ -42,7 +42,7 @@ public class SciProjectDescriptionStep extends SimpleEditStep {
itemModel);
add(UPLOAD_PROJECT_DESC_SHEET_NAME,
(String) SciProjectGlobalizationUtil.globalize(
"sciproject.ui.upload_desc").localize(),
"sciproject.ui.desc.upload").localize(),
new WorkflowLockedComponentAccess(uploadDescForm, itemModel),
uploadDescForm.getSaveCancelSection().getCancelButton());
@ -57,16 +57,16 @@ public class SciProjectDescriptionStep extends SimpleEditStep {
itemModel);
sheet.add(SciProjectGlobalizationUtil.globalize(
"sciorganization.ui.project.desc"),
"sciproject.ui.desc"),
SciProject.PROJECT_DESCRIPTION);
if (SciProject.getConfig().getEnableFunding()) {
sheet.add(SciProjectGlobalizationUtil.globalize(
"sciorganization.ui.project.funding"),
"sciproject.ui.funding"),
SciProject.FUNDING);
}
if (SciProject.getConfig().getEnableFundingVolume()) {
sheet.add(SciProjectGlobalizationUtil.globalize(
"sciproject.ui.funding_volume"),
"sciproject.ui.funding.volume"),
SciProject.FUNDING_VOLUME);
}

View File

@ -38,7 +38,7 @@ implements GenericOrganizationalUnitPersonSelector{
final BasicItemForm addMemberSheet = new SciProjectMemberAddForm(
itemModel, this);
add(ADD_PROJECT_MEMBER_SHEET_NAME,
(String) SciProjectGlobalizationUtil.globalize("sciproject.ui.add_member").localize(),
(String) SciProjectGlobalizationUtil.globalize("sciproject.ui.members.add").localize(),
new WorkflowLockedComponentAccess(addMemberSheet, itemModel),
addMemberSheet.getSaveCancelSection().getCancelButton());

View File

@ -1,4 +1,4 @@
sciproject.ui.basic_properties=Basis properties
sciproject.ui.basic_properties=Basic properties
sciproject.ui.basic_properties.edit=Edit basic properties
sciproject.ui.basic_sheet.edit=Basic properties
sciproject.ui.begin=Start of project
@ -18,34 +18,50 @@ sciproject.ui.properties.title=Properties
sciproject.ui.shortdesc=Short description
sciproject.ui.subproject=Subproject
sciproject.ui.subproject.add=Add subproject
sciproject.ui.subproject.confirm_remove=Are you sure to remove this subordinate project?
sciproject.ui.subproject.down=Down
sciproject.ui.subproject.order.down=Down
sciproject.ui.subprojects.none=No subprojects found
sciproject.ui.subproject.remove=Remove subproject
sciproject.ui.subproject.select=Select project to add as subproject
sciproject.ui.subproject.up=Up
sciproject.ui.subproject.order.up=Up
sciproject.ui.subprojects=Subprojects
sciproject.ui.superproject=Superior project
sciproject.ui.superproject.confirm_remove=Are you sure to remove this superior project?
sciproject.ui.superproject.remove.confirm=Are you sure to remove this superior project?
sciproject.ui.superproject.none=No superior project found
sciproject.ui.superproject.remove=Remove superior project
sciproject.ui.superproject.set=Set superior project
sciproject.ui.superproject.select=Select superior project
sciproject.ui.title=Name of the project
sciproject.ui.title=Titel of the project
sciproject.ui.subprojects.title=Subordinate projects
sciproject.ui.subprojects.description=Step for adding subordinate projects
sciproject.ui.superprojects.title=Superior project(s)
sciproject.ui.superprojects.description=Step add adding/setting superior projects
sciproject.ui.superproject.select.nothing=No project selected to add as superior project
sciproject.ui.superproject.no_suitable_language_variant=The selected project has no suitable language variant
sciproject.ui.superproject.adding_to_itself=It is not possible to add a project to itself as a superior project
sciproject.ui.superproject.already_added=The selected project has already been added to this project as a superior project
sciproject.ui.superproject.add=Add superior project
sciproject.ui.superprojects.empty_view=No superior project(s)
sciproject.ui.superprojects.columns.name=Title of the project
sciproject.ui.superprojects.columns.delete=Remove
sciproject.ui.superprojects.columns.up=Up
sciproject.ui.superprojects.columns.down=Down
sciproject.ui.superproject.delete=Remove
sciproject.ui.superproject.order.up=Up
sciproject.ui.superproject.order.down=Down
sciproject.ui.desc.edit=Edit description
sciproject.ui.desc.upload=Upload description
sciproject.ui.subproject.select.nothing=No project to add as subordinate project selected
sciproject.ui.subproject.adding_to_itself=It is not possible to add a project to itself as a subordinate project
sciproject.ui.subproject.already_added=The selected project has already been added to this project as a subproject
sciproject.ui.subprojects.empty_view=No subprojects found
sciproject.ui.subprojects.columns.name=Title of the project
sciproject.ui.subprojects.colums.delete=Remove
sciproject.ui.subprojects.columns.up=Up
sciproject.ui.subprojects.columns.down=Down
sciproject.ui.subproject.delete=Remove
sciproject.ui.subproject.remove.confirm=Are you sure to remove this subordinate project?
sciorganization.ui.project_properties.title=Basic properties
sciorganization.ui.project.members=Members
sciorganization.ui.project_description.title=Description
sciproject.ui.edit_basic_sheet=Edit basic properties

View File

@ -20,17 +20,49 @@ sciproject.ui.properties.title=Basiseigenschaften
sciproject.ui.shortdesc=Kurzbeschreibung
sciproject.ui.subproject=Unterprojekt
sciproject.ui.subproject.add=Unterprojekt hinzuf\u00fcgen
sciproject.ui.subproject.confirm_remove=Wollen Sie das ausgew\u00e4hlte Unterprojekt wirklich entfernen?
sciproject.ui.subproject.down=Runter
sciproject.ui.subproject.order.down=Runter
sciproject.ui.subprojects.none=Keine Unterprojekte gefunden
sciproject.ui.subproject.remove=Unterprojekt entfernen
sciproject.ui.subproject.select=W\u00e4hlen das Projekt aus, dass als Unterprojekt hinzugef\u00fcgt werden soll
sciproject.ui.subproject.up=Hoch
sciproject.ui.subproject.order.up=Hoch
sciproject.ui.subprojects=Unterprojekte
sciproject.ui.superproject=\u00dcbergeordnetes Projekt
sciproject.ui.superproject.confirm_remove=Wollen Sie das \u00fcbergeordnete Projekte wirklich entfernen?
sciproject.ui.superproject.remove.confirm=Wollen Sie das \u00fcbergeordnete Projekte wirklich entfernen?
sciproject.ui.superproject.none=Keine \u00fcbergeordneten Projekte gefunden.
sciproject.ui.superproject.remove=\u00dcbergeordnetes Projekt entfernen
sciproject.ui.superproject.select=\u00dcbergeordetes Projekt ausw\u00e4hlen
sciproject.ui.superproject.set=\u00dcbergeordnetes Projekt setzen
sciproject.ui.title=Name des Projektes
sciproject.ui.title=Titel des Projektes
sciproject.ui.subprojects.title=Unterprojekte
sciproject.ui.subprojects.description=Bearbeitungsschritt zum Hinzuf\u00fcgen von Unterprojekte
sciproject.ui.superprojects.title=\u00dcbergeordnete(s) Projekt(e)
sciproject.ui.superprojects.description=Bearbeitungsschritt zum Hinzuf\u00fcgen eines oder mehrerer \u00fcbergeordeter Projekte
sciproject.ui.superproject.select.nothing=Es wurde kein Projekt zum Hinzuf\u00fcgen als \u00fcbergeordnetes Projekt ausgew\u00e4hlt
sciproject.ui.superproject.no_suitable_language_variant=Das ausgew\u00e4hlte Projekte hat keine passende Sprachvariante
sciproject.ui.superproject.adding_to_itself=Ein Projekt kann nicht sich selbst als \u00fcbergeordnetes Projekt zugewiesen werden
sciproject.ui.superproject.already_added=Das ausgew\u00e4hlte Projekt wurde diesem Projekt bereits als \u00fcbergeordnetes Projekt zugewiesen
sciproject.ui.superproject.add=\u00dcbergeordnetes Projekt hinzuf\u00fcgen
sciproject.ui.superprojects.empty_view=Keine \u00fcbergeordneten Projekte
sciproject.ui.superprojects.columns.name=Title des Projektes
sciproject.ui.superprojects.columns.delete=Entfernen
sciproject.ui.superprojects.columns.up=Hoch
sciproject.ui.superprojects.columns.down=Runter
sciproject.ui.superproject.delete=Entfernen
sciproject.ui.superproject.order.up=Hoch
sciproject.ui.superproject.order.down=Runter
sciproject.ui.desc.edit=Beschreibung bearbeiten
sciproject.ui.desc.upload=Beschreibung hochladen
sciproject.ui.subproject.select.nothing=Es wurde eine Projekt zum Hinzuf\u00fcgen als Unterprojekt ausgew\u00e4hlt
sciproject.ui.subproject.adding_to_itself=Es ist nicht m\u00f6glich, ein Projekt sich selbst als Unterprojekt zuzuweisen
sciproject.ui.subproject.already_added=Das ausgew\u00e4hlte Projekt wurde diesem Projekt bereits als Unterprojekt zugewiesen
sciproject.ui.subprojects.empty_view=Keine Unterprojekte gefunden
sciproject.ui.subprojects.columns.name=Titel des Projektes
sciproject.ui.subprojects.colums.delete=Entfernen
sciproject.ui.subprojects.columns.up=Hoch
sciproject.ui.subprojects.columns.down=Runter
sciproject.ui.subproject.delete=Entfernen
sciproject.ui.subproject.remove.confirm=Wollen Sie das ausgew\u00e4hlte Unterprojekt wirklich entfernen?
sciorganization.ui.project_properties.title=Basiseigenschaften
sciorganization.ui.project.members=Mitglieder
sciorganization.ui.project_description.title=Beschreibung
sciproject.ui.edit_basic_sheet=Basiseigenschaften bearbeiten

View File

@ -47,7 +47,7 @@ public class SciProjectSubProjectsStep extends SimpleEditStep {
public String getNothingSelectedMessage() {
return (String) SciProjectGlobalizationUtil.globalize(
"sciproject.ui.subproject.nothing_selected").
"sciproject.ui.subproject.select.nothing").
localize();
}
@ -112,12 +112,12 @@ public class SciProjectSubProjectsStep extends SimpleEditStep {
public String getUpLabel() {
return (String) SciProjectGlobalizationUtil.globalize(
"sciproject.ui.subproject.up").localize();
"sciproject.ui.subproject.order.up").localize();
}
public String getDownLabel() {
return (String) SciProjectGlobalizationUtil.globalize(
"sciproject.ui.subproject.down").localize();
"sciproject.ui.subproject.order.down").localize();
}
public String getConfirmRemoveLabel() {

View File

@ -47,7 +47,7 @@ public class SciProjectSuperProjectsStep extends SimpleEditStep {
public String getNothingSelectedMessage() {
return (String) SciProjectGlobalizationUtil.globalize(
"sciproject.ui.superproject.nothing_selected").localize();
"sciproject.ui.superproject.select.nothing").localize();
}
public String getNoSuitableLanguageVariantMessage() {
@ -105,12 +105,12 @@ public class SciProjectSuperProjectsStep extends SimpleEditStep {
public String getUpLabel() {
return (String) SciProjectGlobalizationUtil.globalize(
"sciproject.ui.superproject.up").localize();
"sciproject.ui.superproject.order.up").localize();
}
public String getDownLabel() {
return (String) SciProjectGlobalizationUtil.globalize(
"sciproject.ui.superproject.down").localize();
"sciproject.ui.superproject.order.down").localize();
}
public String getConfirmRemoveLabel() {