diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertyForm.java index 61bf8b72c..fdbbe0c17 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertyForm.java @@ -54,6 +54,7 @@ public class ArticleInJournalPropertyForm private static final String REVIEWED = "reviewed"; private ArticleInJournalPropertiesStep m_step; public static final String ID = "ArticleInJournalEdit"; + private Label reviewedLabel; private CheckboxGroup reviewed; public ArticleInJournalPropertyForm(ItemSelectionModel itemModel) { @@ -112,13 +113,22 @@ public class ArticleInJournalPropertyForm pubDate.setYearRange(1900, today.get(Calendar.YEAR) + 2); add(pubDate); - add(new Label(PublicationGlobalizationUtil.globalize( - "publications.ui.articleinjournal.reviewed"))); + reviewedLabel = new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.articleinjournal.reviewed")); + add(reviewedLabel); reviewed = new CheckboxGroup("reviewedGroup"); reviewed.addOption(new Option(REVIEWED, "")); add(reviewed); } - + + protected final Label getReviewedLabel() { + return reviewedLabel; + } + + protected final CheckboxGroup getReviewed() { + return reviewed; + } + @Override public void init(FormSectionEvent fse) throws FormProcessException { super.init(fse); @@ -167,4 +177,5 @@ public class ArticleInJournalPropertyForm article.save(); } } + } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ReviewPropertiesStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ReviewPropertiesStep.java index 8875b9e23..380cc1f37 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ReviewPropertiesStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ReviewPropertiesStep.java @@ -21,12 +21,17 @@ package com.arsdigita.cms.contenttypes.ui; import com.arsdigita.bebop.Component; import com.arsdigita.bebop.Label; +import com.arsdigita.bebop.PageState; import com.arsdigita.cms.ItemSelectionModel; +import com.arsdigita.cms.contenttypes.ArticleInJournal; +import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil; import com.arsdigita.cms.ui.authoring.AuthoringKitWizard; import com.arsdigita.cms.ui.authoring.BasicPageForm; import com.arsdigita.cms.ui.authoring.SimpleEditStep; import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess; +import com.arsdigita.domain.DomainObject; import com.arsdigita.toolbox.ui.DomainObjectPropertySheet; +import java.text.DateFormat; /** * @@ -41,8 +46,45 @@ public class ReviewPropertiesStep extends ArticleInJournalPropertiesStep { public static Component getReviewPropertySheet( ItemSelectionModel itemModel) { - DomainObjectPropertySheet sheet = (DomainObjectPropertySheet) ArticleInJournalPropertiesStep. - getArticleInJournalPropertySheet(itemModel); + DomainObjectPropertySheet sheet = (DomainObjectPropertySheet) PublicationPropertiesStep. + getPublicationPropertySheet(itemModel); + + sheet.add(PublicationGlobalizationUtil.globalize( + "publications.ui.articleinjournal.volume"), + ArticleInJournal.VOLUME); + + sheet.add(PublicationGlobalizationUtil.globalize( + "publications.ui.articleinjournal.issue"), + ArticleInJournal.ISSUE); + + sheet.add(PublicationGlobalizationUtil.globalize( + "publications.ui.articleinjournal.pages_from"), + ArticleInJournal.PAGES_FROM); + + sheet.add(PublicationGlobalizationUtil.globalize( + "publications.ui.articleinjournal.pages_to"), + ArticleInJournal.PAGES_TO); + + sheet.add(PublicationGlobalizationUtil.globalize( + "publications.ui.articleinjournal.publication_date"), + ArticleInJournal.PUBLICATION_DATE, + new DomainObjectPropertySheet.AttributeFormatter() { + public String format(DomainObject obj, + String attribute, + PageState state) { + + ArticleInJournal article = (ArticleInJournal) obj; + + if (article.getPublicationDate() != null) { + return DateFormat.getDateInstance(DateFormat.LONG).format( + article.getPublicationDate()); + } else { + return (String) ContenttypesGlobalizationUtil.globalize( + "cms.ui.unknown").localize(); + } + } + + }); return sheet; } @@ -73,4 +115,5 @@ public class ReviewPropertiesStep extends ArticleInJournalPropertiesStep { "publications.ui.publication.basic_properties"). localize()), basicProperties); } + } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ReviewPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ReviewPropertyForm.java index bd4f2569f..88148881f 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ReviewPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ReviewPropertyForm.java @@ -22,6 +22,7 @@ package com.arsdigita.cms.contenttypes.ui; import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.Label; +import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; @@ -63,22 +64,26 @@ public class ReviewPropertyForm @Override protected void addWidgets() { - super.addWidgets(); + super.addWidgets(); } @Override public void init(FormSectionEvent fse) throws FormProcessException { super.init(fse); - FormData data = fse.getFormData(); - Review review = (Review) initBasicWidgets(fse); + final PageState state = fse.getPageState(); + getReviewedLabel().setVisible(state, false); + getReviewed().setVisible(state, false); + +// FormData data = fse.getFormData(); +// Review review = (Review) initBasicWidgets(fse); } @Override public void process(FormSectionEvent fse) throws FormProcessException { super.process(fse); - FormData data = fse.getFormData(); - Review review = (Review) processBasicWidgets(fse); +// FormData data = fse.getFormData(); +// Review review = (Review) processBasicWidgets(fse); } }