diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonAliasSetForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonAliasSetForm.java index 2cf37d19f..a49791437 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonAliasSetForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonAliasSetForm.java @@ -55,7 +55,8 @@ public class GenericPersonAliasSetForm "cms.contenttypes.ui.person.alias.select").localize())); itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType. findByAssociatedObjectType( - "com.arsdigita.cms.contenttypes.GenericPerson")); + "com.arsdigita.cms.contenttypes.GenericPerson")); + itemSearch.setEditAfterCreate(false); add(itemSearch); } diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactAddForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactAddForm.java index e586d2f0e..95685fb25 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactAddForm.java @@ -134,6 +134,7 @@ public class GenericPersonContactAddForm extends BasicItemForm { person.addContact(contact, (String) data.get( GenericPersonContactCollection.CONTACTS_KEY)); + m_itemSearch.publishCreatedItem(data, contact); } init(fse); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig.java index 60da83a9a..a098360bc 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig.java @@ -42,52 +42,52 @@ public class PublicationsConfig extends AbstractConfig { defaultAuthorsFolder = new IntegerParameter( "com.arsdigita.cms.contenttypes.publications.default_authors_folder", - Parameter.REQUIRED, + Parameter.OPTIONAL, null); defaultSeriesFolder = new IntegerParameter( "com.arsdigita.cms.contenttypes.publications.default_series_folder", - Parameter.REQUIRED, + Parameter.OPTIONAL, null); defaultPublisherFolder = new IntegerParameter( "com.arsdigita.cms.contenttypes.publications.default_publisher_folder", - Parameter.REQUIRED, + Parameter.OPTIONAL, null); defaultCollectedVolumesFolder = new IntegerParameter( "com.arsdigita.cms.contenttypes.publications.default_collectedvolumes_folder", - Parameter.REQUIRED, + Parameter.OPTIONAL, null); defaultJournalsFolder = new IntegerParameter( "com.arsdigita.cms.contenttypes.publications.default_journals_folder", - Parameter.REQUIRED, + Parameter.OPTIONAL, null); defaultArticlesInCollectedVolumeFolder = new IntegerParameter( "com.arsdigita.cms.contenttypes.publications.default_articlesincollectedvolume_folder", - Parameter.REQUIRED, + Parameter.OPTIONAL, null); defaultOrganizationsFolder = new IntegerParameter( "com.arsdigita.cms.contenttypes.publications.default_organizations_folder", - Parameter.REQUIRED, + Parameter.OPTIONAL, null); defaultProceedingsFolder = new IntegerParameter( "com.arsdigita.cms.contenttypes.publications.default_proceedings_folder", - Parameter.REQUIRED, + Parameter.OPTIONAL, null); defaultInProceedingsFolder = new IntegerParameter( "com.arsdigita.cms.contenttypes.publications.default_inproccedings_folder", - Parameter.REQUIRED, + Parameter.OPTIONAL, null); defaultArticlesInJournalFolder = new IntegerParameter( "com.arsdigita.cms.contenttypes.publications.default_articlesinjournal_folder", - Parameter.REQUIRED, + Parameter.OPTIONAL, null); register(attachOrgaUnitsStep); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalForm.java index 3ab0ec852..085ade048 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalForm.java @@ -70,6 +70,7 @@ public class ArticleInJournalJournalForm if ((config.getDefaultJournalsFolder() != null) && (config.getDefaultJournalsFolder() != 0)) { itemSearch.setDefaultCreationFolder(new Folder(new BigDecimal(config.getDefaultJournalsFolder()))); } + itemSearch.setEditAfterCreate(false); add(itemSearch); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererForm.java index e17e26fe9..39f992bbc 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererForm.java @@ -50,6 +50,7 @@ public class ExpertiseOrdererForm if ((config.getDefaultOrganizationsFolder() != null) && (config.getDefaultOrganizationsFolder() != 0)) { itemSearch.setDefaultCreationFolder(new Folder(new BigDecimal(config.getDefaultOrganizationsFolder()))); } + itemSearch.setEditAfterCreate(false); add(itemSearch); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationForm.java index efb392fae..ad724e4e0 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationForm.java @@ -36,7 +36,6 @@ public class ExpertiseOrganizationForm config.load(); } - public ExpertiseOrganizationForm(final ItemSelectionModel itemModel) { super("ExpertiseOrganizationForm", itemModel); } @@ -48,9 +47,10 @@ public class ExpertiseOrganizationForm itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType. findByAssociatedObjectType(GenericOrganizationalUnit.class. getName())); - if ((config.getDefaultOrganizationsFolder() != null) && (config.getDefaultOrganizationsFolder() != 0)) { + if ((config.getDefaultOrganizationsFolder() != null) && (config.getDefaultOrganizationsFolder() != 0)) { itemSearch.setDefaultCreationFolder(new Folder(new BigDecimal(config.getDefaultOrganizationsFolder()))); } + itemSearch.setEditAfterCreate(false); add(itemSearch); } @@ -106,4 +106,5 @@ public class ExpertiseOrganizationForm } } + } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationForm.java index c33ea0454..442f9ce51 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationForm.java @@ -50,7 +50,7 @@ public class InternetArticleOrganizationForm if ((config.getDefaultOrganizationsFolder() != null) && (config.getDefaultOrganizationsFolder() != 0)) { itemSearch.setDefaultCreationFolder(new Folder(new BigDecimal(config.getDefaultOrganizationsFolder()))); } - + itemSearch.setEditAfterCreate(false); add(itemSearch); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerForm.java index 0190af593..c094375a9 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerForm.java @@ -50,6 +50,7 @@ public class ProceedingsOrganizerForm if ((config.getDefaultOrganizationsFolder() != null) && (config.getDefaultOrganizationsFolder() != 0)) { itemSearch.setDefaultCreationFolder(new Folder(new BigDecimal(config.getDefaultOrganizationsFolder()))); } + itemSearch.setEditAfterCreate(false); add(itemSearch); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorAddForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorAddForm.java index fe6a01748..62c2f452d 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorAddForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorAddForm.java @@ -86,7 +86,7 @@ public class PublicationAuthorAddForm if ((config.getDefaultAuthorsFolder() != null) && (config.getDefaultAuthorsFolder() != 0)) { m_itemSearch.setDefaultCreationFolder(new Folder(new BigDecimal(config.getDefaultAuthorsFolder()))); } - //m_itemSearch.setEditAfterCreate(true); + m_itemSearch.setEditAfterCreate(false); add(m_itemSearch); selectedAuthorLabel = new Label(""); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationWithPublisherSetPublisherForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationWithPublisherSetPublisherForm.java index 58412d1a3..af913d583 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationWithPublisherSetPublisherForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationWithPublisherSetPublisherForm.java @@ -51,6 +51,7 @@ public class PublicationWithPublisherSetPublisherForm if ((config.getDefaultPublisherFolder() != null) && config.getDefaultPublisherFolder() != 0) { itemSearch.setDefaultCreationFolder(new Folder(new BigDecimal(config.getDefaultPublisherFolder()))); } + itemSearch.setEditAfterCreate(false); add(itemSearch); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesEditshipAddForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesEditshipAddForm.java index 012c1a9e8..e00348ac9 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesEditshipAddForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesEditshipAddForm.java @@ -88,6 +88,7 @@ public class SeriesEditshipAddForm if ((config.getDefaultAuthorsFolder() != null) && (config.getDefaultAuthorsFolder() != 0)) { m_itemSearch.setDefaultCreationFolder(new Folder(new BigDecimal(config.getDefaultAuthorsFolder()))); } + m_itemSearch.setEditAfterCreate(false); add(m_itemSearch); selectedEditorLabel = new Label(""); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/UnPublishedOrganizationForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/UnPublishedOrganizationForm.java index c8a111f31..c0ee922a5 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/UnPublishedOrganizationForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/UnPublishedOrganizationForm.java @@ -50,6 +50,7 @@ public class UnPublishedOrganizationForm if ((config.getDefaultOrganizationsFolder() != null) && (config.getDefaultOrganizationsFolder() != 0)) { itemSearch.setDefaultCreationFolder(new Folder(new BigDecimal(config.getDefaultOrganizationsFolder()))); } + itemSearch.setEditAfterCreate(false); add(itemSearch); }