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

Ein paar kleine Änderungen, unter anderem Anpassungen der Namen von web.*.xml Dateien 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1181 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-10-20 14:53:11 +00:00
parent 4390b48265
commit e92325b459
6 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
ccm-cms-publicpersonalprofile/web/WEB-INF/web.publicpersonalprofile.xml → ccm-cms-publicpersonalprofile/web/WEB-INF/web.ccm-cms-publicpersonalprofile.xml
View File

19
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitSubordinateOrgaUnitAddForm.java
View File

@ -35,22 +35,29 @@ public class GenericOrganizationalUnitSubordinateOrgaUnitAddForm
final GenericOrgaUnitSubordinateOrgaUnitAddFormCustomizer customizer) {
super("SubordinateOrgaUnitsAddForm", itemModel);
this.customizer = customizer;
}
@Override
protected void addWidgets() {
add(new Label(customizer.getSelectSubordinateOrgaUnitLabel()));
itemSearch = new ItemSearchWidget(
ITEM_SEARCH,
ContentType.findByAssociatedObjectType(
customizer.getSubordinateOrgaUnitType()));
add(itemSearch);
add(itemSearch);
}
@Override
protected void addWidgets() {
/*add(new Label(customizer.getSelectSubordinateOrgaUnitLabel()));
itemSearch = new ItemSearchWidget(
ITEM_SEARCH,
ContentType.findByAssociatedObjectType(
customizer.getSubordinateOrgaUnitType()));
add(itemSearch); */
}
@Override
public void init(final FormSectionEvent fse) throws FormProcessException {
final PageState state = fse.getPageState();
setVisible(state, true);
}

29
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitSuperiorOrgaUnitAddForm.java
View File

@ -23,7 +23,7 @@ import com.arsdigita.cms.ui.authoring.BasicItemForm;
public class GenericOrganizationalUnitSuperiorOrgaUnitAddForm
extends BasicItemForm
implements FormProcessListener,
FormInitListener {
FormInitListener {
private ItemSearchWidget itemSearch;
private final String ITEM_SEARCH = "superiorOrgaUnits";
@ -34,10 +34,6 @@ public class GenericOrganizationalUnitSuperiorOrgaUnitAddForm
final GenericOrgaUnitSuperiorOrgaUnitAddFormCustomizer customizer) {
super("SuperiorOrgaUnitsAddForm", itemModel);
this.customizer = customizer;
}
@Override
protected void addWidgets() {
add(new Label(customizer.getSelectSuperiorOrgaUnitLabel()));
itemSearch = new ItemSearchWidget(
ITEM_SEARCH,
@ -46,6 +42,10 @@ public class GenericOrganizationalUnitSuperiorOrgaUnitAddForm
add(itemSearch);
}
@Override
protected void addWidgets() {
}
@Override
public void init(final FormSectionEvent fse) throws FormProcessException {
final PageState state = fse.getPageState();
@ -58,15 +58,14 @@ public class GenericOrganizationalUnitSuperiorOrgaUnitAddForm
final FormData data = fse.getFormData();
final PageState state = fse.getPageState();
final GenericOrganizationalUnit orgaunit =
(GenericOrganizationalUnit) getItemSelectionModel().
(GenericOrganizationalUnit) getItemSelectionModel().
getSelectedObject(state);
if (getSaveCancelSection().getSaveButton().isSelected(state)) {
GenericOrganizationalUnit supOrgaUnit =
(GenericOrganizationalUnit) data.get(
(GenericOrganizationalUnit) data.get(
ITEM_SEARCH);
supOrgaUnit = (GenericOrganizationalUnit) supOrgaUnit.
getContentBundle().getInstance(orgaunit.getLanguage(), true);
supOrgaUnit = (GenericOrganizationalUnit) supOrgaUnit.getContentBundle().getInstance(orgaunit.getLanguage(), true);
orgaunit.addSuperiorOrgaUnit(orgaunit, customizer.getAssocType());
}
@ -85,24 +84,24 @@ public class GenericOrganizationalUnitSuperiorOrgaUnitAddForm
}
final GenericOrganizationalUnit orgaunit =
(GenericOrganizationalUnit) getItemSelectionModel().
(GenericOrganizationalUnit) getItemSelectionModel().
getSelectedObject(state);
GenericOrganizationalUnit supOrgaUnit =
(GenericOrganizationalUnit) data.get(
(GenericOrganizationalUnit) data.get(
ITEM_SEARCH);
if (!(supOrgaUnit.getContentBundle().hasInstance(orgaunit.getLanguage(),
true))) {
true))) {
data.addError(customizer.getNoSuitableLanguageVariantMessage());
return;
}
supOrgaUnit = (GenericOrganizationalUnit) supOrgaUnit.getContentBundle().getInstance(orgaunit.getLanguage(), true);
if (orgaunit.getID().equals(supOrgaUnit.getID())) {
data.addError(customizer.getAddingToItselfMessage());
return;
}
final GenericOrganizationalUnitSuperiorCollection supOrgaUnits = orgaunit.getSuperiorOrgaUnits();
supOrgaUnits.addFilter(String.format("id = %s", supOrgaUnit.getID().toString()));
if (supOrgaUnits.size() > 0) {

5
ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicItemForm.java
View File

@ -100,7 +100,7 @@ public abstract class BasicItemForm
addProcessListener(this);
addValidationListener(this);
}
/**
* Construct a new BasicItemForm with nothing on it
*
@ -181,6 +181,7 @@ public abstract class BasicItemForm
}
@Override
public void generateXML(PageState ps, Element parent) {
m_script.generateXML(ps, parent);
super.generateXML(ps, parent);
@ -369,6 +370,7 @@ public abstract class BasicItemForm
*
* @param pc the component to add to this BasicPageForm
* */
@Override
public void add(Component pc) {
m_widgetSection.add(pc);
}
@ -383,6 +385,7 @@ public abstract class BasicItemForm
* @param constraints layout constraints (a
* bitwise OR of static ints in the particular layout)
* */
@Override
public void add(Component pc, int constraints) {
m_widgetSection.add(pc, constraints);
}

0
ccm-sci-publications/web/WEB-INF/web.scipublications.xml → ccm-sci-publications/web/WEB-INF/web.ccm-sci-publications.xml
View File

2
ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectInitializer.java
View File

@ -22,7 +22,7 @@ public class SciProjectInitializer extends ContentTypeInitializer {
public void init(final DomainInitEvent event) {
super.init(event);
SciProjectConfig config = SciProject.getConfig();
final SciProjectConfig config = SciProject.getConfig();
if (config.getEnableSubProjectsStep()) {
AuthoringKitWizard.registerAssetStep(SciProject.BASE_DATA_OBJECT_TYPE,