From a1b70f3757dbef0fef57471a8433f4ebcae33cf2 Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 6 Sep 2011 18:13:56 +0000 Subject: [PATCH] =?UTF-8?q?RelatedLinks=20und=20Notes,=20die=20dem=20Publi?= =?UTF-8?q?cPersonalProfile-Item=20zugeordnet=20sind=20werden=20jetzt=20au?= =?UTF-8?q?f=20der=20Startseite=20ausgegeben.=20Erfordert=20eine=20Mandala?= =?UTF-8?q?y-Version,=20die=20den=20Content-Typ=20'PublicPersonProfile'=20?= =?UTF-8?q?unterst=C3=BCtzt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@1099 8810af33-2d31-482b-a856-94f89814c4df --- .../arsdigita/cms/dabin/PersonImporter.java | 6 ++-- .../contenttypes/PublicPersonalProfile.xml | 8 +++++ .../PublicPersonalProfilesServlet.java | 33 +++++++++++-------- 3 files changed, 30 insertions(+), 17 deletions(-) diff --git a/ccm-cms-dabinpersonimporter/src/com/arsdigita/cms/dabin/PersonImporter.java b/ccm-cms-dabinpersonimporter/src/com/arsdigita/cms/dabin/PersonImporter.java index 7ca669db0..5a4c67bbf 100644 --- a/ccm-cms-dabinpersonimporter/src/com/arsdigita/cms/dabin/PersonImporter.java +++ b/ccm-cms-dabinpersonimporter/src/com/arsdigita/cms/dabin/PersonImporter.java @@ -558,7 +558,7 @@ public class PersonImporter extends Program { membersFormerDepartmentCategories.get(result. getString("abteilunglink.Abteilung_Id")); } else if ("Assoziert".equals(result.getString( - "person.Eigenscahaft"))) { + "person.Eigenschaft"))) { depCat = membersAssociatedDepartmentCategories. get(result.getString( "abteilunglink.Abteilung_Id")); @@ -573,9 +573,9 @@ public class PersonImporter extends Program { if (!result.getString("person.Angaben").isEmpty()) { Contact contact = new Contact(); contact.setLanguage("de"); - contact.setName(String.format("kontakt-%s", person. + contact.setName(String.format("%s-kontakt", person. getName())); - contact.setTitle(String.format("Kontakt %s", person. + contact.setTitle(String.format("%s Kontakt", person. getTitle())); contact.setPerson(person, "commonContact"); diff --git a/ccm-cms-publicpersonalprofile/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml b/ccm-cms-publicpersonalprofile/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml index 9bfbd6985..2baf7cb0b 100644 --- a/ccm-cms-publicpersonalprofile/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml +++ b/ccm-cms-publicpersonalprofile/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml @@ -11,6 +11,14 @@ + + + + + + + + diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesServlet.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesServlet.java index cbb4b5796..d5e3d1100 100644 --- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesServlet.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesServlet.java @@ -69,7 +69,7 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet { protected void doService(final HttpServletRequest request, final HttpServletResponse response, final Application app) throws ServletException, - IOException { + IOException { String path = ""; logger.debug("PublicPersonalProfileServlet is starting..."); @@ -164,7 +164,8 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet { throw new IllegalStateException( "More than one matching members found..."); } else { - final PageState state = new PageState(page, request, + final PageState state = new PageState(page, + request, response); profiles.next(); @@ -185,17 +186,22 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet { createNavigation(profile, root, navPath); if (navPath == null) { - generateProfileOwnerXml(profileElem, owner, state); - + final PublicPersonalProfileXmlGenerator generator = + new PublicPersonalProfileXmlGenerator( + profile); + generator.generateXML(state, root, ""); + + //generateProfileOwnerXml(profileElem, owner, state); + /*DataCollection relatedLinks = RelatedLink.getRelatedLinks(profile, "NONE"); if (relatedLinks.size() > 0) { - + } DataCollection notes = Note.getNotes(profile); if (notes.size() > 0) { - - } */ + + } */ } else { final DataCollection links = RelatedLink.getRelatedLinks(profile, @@ -270,9 +276,7 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet { final PublicPersonalProfileXmlGenerator generator = new PublicPersonalProfileXmlGenerator( item); - generator.generateXML(new PageState(page, - request, - response), + generator.generateXML(state, root, ""); } @@ -432,7 +436,7 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet { "titlePost"); titlePost.setText(owner.getTitlePost()); } - + if (owner.hasContacts()) { final GenericPersonContactCollection contacts = owner.getContacts(); //final String contactType = config.getContactType(); @@ -444,7 +448,7 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet { contacts.next(); generateContactXml(profileOwnerElem, contacts.getContact(), - state); + state); } } @@ -526,14 +530,15 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet { final ParameterSingleSelectionModel navItemSelect = new ParameterSingleSelectionModel( navItemKeyParam); - + page.addGlobalStateParam(navItemKeyParam); final BoxPanel box = new BoxPanel(BoxPanel.VERTICAL); final FormSection tableSection = new FormSection(box); final PublicPersonalProfileNavItemsAddForm addForm = - new PublicPersonalProfileNavItemsAddForm(navItemSelect); + new PublicPersonalProfileNavItemsAddForm( + navItemSelect); final PublicPersonalProfileNavItemsTable table = new PublicPersonalProfileNavItemsTable( navItemSelect);