From 21c4b667462162f328eed47e11a1e5379b571469 Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 31 Oct 2014 08:13:04 +0000 Subject: [PATCH] Two bug fixes for ccm-sci-types-project: - Confirmation text for removing a sponsor is now translated - Removing a sponsor now works git-svn-id: https://svn.libreccm.org/ccm/trunk@2937 8810af33-2d31-482b-a856-94f89814c4df --- .../src/com/arsdigita/cms/contenttypes/SciProjectBundle.java | 2 +- .../arsdigita/cms/contenttypes/SciProjectResources.properties | 1 + .../cms/contenttypes/SciProjectResources_de.properties | 1 + .../arsdigita/cms/contenttypes/ui/SciProjectSponsorSheet.java | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectBundle.java b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectBundle.java index 44d4ad8b9..ab0741406 100644 --- a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectBundle.java +++ b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectBundle.java @@ -86,7 +86,7 @@ public class SciProjectBundle extends GenericOrganizationalUnitBundle { public void removeSponsor(final GenericOrganizationalUnit sponsor) { Assert.exists(sponsor, GenericOrganizationalUnit.class); - remove(SPONSORS, sponsor); + remove(SPONSORS, sponsor.getGenericOrganizationalUnitBundle()); } @Override diff --git a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectResources.properties b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectResources.properties index d6f7752a9..8eaad19af 100644 --- a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectResources.properties +++ b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectResources.properties @@ -104,3 +104,4 @@ sciproject.ui.sponsor.up=Up sciproject.ui.sponsor.down=Down sciproject.ui.sponsor.edit_assoc=Edit cms.contenttypes.sciproject.type_label=Research Project +sciproject.ui.sponsor_remove.confirm=Are your sure to remove this sponsor? diff --git a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectResources_de.properties b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectResources_de.properties index 9970a9a25..576467786 100644 --- a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectResources_de.properties +++ b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectResources_de.properties @@ -105,3 +105,4 @@ sciproject.ui.sponsor.up=Hoch sciproject.ui.sponsor.down=Runter sciproject.ui.sponsor.edit_assoc=Bearbeiten cms.contenttypes.sciproject.type_label=Forschungsproject +sciproject.ui.sponsor_remove.confirm=Sind sie sicher das Sie diesen Mittelgeber entfernen m\u00f6chten? diff --git a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSponsorSheet.java b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSponsorSheet.java index b3e887eff..494635e68 100644 --- a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSponsorSheet.java +++ b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSponsorSheet.java @@ -251,7 +251,7 @@ public class SciProjectSponsorSheet extends Table { if (canEdit) { final ControlLink link = new ControlLink((Label)value); link.setConfirmation(SciProjectGlobalizationUtil.globalize( - "sciproject.ui.sponsor.remove.confirm")); + "sciproject.ui.sponsor_remove.confirm")); return link; } else { return new Label("");