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

RelatedLinks und Notes, die dem PublicPersonalProfile-Item zugeordnet sind werden jetzt auf der Startseite ausgegeben. 

Erfordert eine Mandalay-Version, die den Content-Typ 'PublicPersonProfile' unterstützt.


git-svn-id: https://svn.libreccm.org/ccm/trunk@1099 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-09-06 18:13:56 +00:00
parent a6e10ab7c2
commit a1b70f3757
3 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ccm-cms-dabinpersonimporter/src/com/arsdigita/cms/dabin/PersonImporter.java
View File

@ -558,7 +558,7 @@ public class PersonImporter extends Program {
membersFormerDepartmentCategories.get(result. membersFormerDepartmentCategories.get(result.
getString("abteilunglink.Abteilung_Id")); getString("abteilunglink.Abteilung_Id"));
} else if ("Assoziert".equals(result.getString( } else if ("Assoziert".equals(result.getString(
"person.Eigenscahaft"))) { "person.Eigenschaft"))) {
depCat = membersAssociatedDepartmentCategories. depCat = membersAssociatedDepartmentCategories.
get(result.getString( get(result.getString(
"abteilunglink.Abteilung_Id")); "abteilunglink.Abteilung_Id"));
@ -573,9 +573,9 @@ public class PersonImporter extends Program {
if (!result.getString("person.Angaben").isEmpty()) { if (!result.getString("person.Angaben").isEmpty()) {
Contact contact = new Contact(); Contact contact = new Contact();
contact.setLanguage("de"); contact.setLanguage("de");
contact.setName(String.format("kontakt-%s", person. contact.setName(String.format("%s-kontakt", person.
getName())); getName()));
contact.setTitle(String.format("Kontakt %s", person. contact.setTitle(String.format("%s Kontakt", person.
getTitle())); getTitle()));
contact.setPerson(person, "commonContact"); contact.setPerson(person, "commonContact");

8
ccm-cms-publicpersonalprofile/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml
View File

@ -11,6 +11,14 @@
<xrd:attributes rule="exclude"> <xrd:attributes rule="exclude">
<xrd:property name="/object/profileUrl"/> <xrd:property name="/object/profileUrl"/>
</xrd:attributes> </xrd:attributes>
<xrd:associations rule="include">
<xrd:property name="/object/owner"/>
<xrd:property name="/object/owner/contacts"/>
<xrd:property name="/object/owner/contacts/contactentries"/>
<xrd:property name="/object/owner/contacts/address"/>
</xrd:associations>
</xrd:adapter> </xrd:adapter>
</xrd:context> </xrd:context>

33
ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesServlet.java
View File

@ -69,7 +69,7 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet {
protected void doService(final HttpServletRequest request, protected void doService(final HttpServletRequest request,
final HttpServletResponse response, final HttpServletResponse response,
final Application app) throws ServletException, final Application app) throws ServletException,
IOException { IOException {
String path = ""; String path = "";
logger.debug("PublicPersonalProfileServlet is starting..."); logger.debug("PublicPersonalProfileServlet is starting...");
@ -164,7 +164,8 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet {
throw new IllegalStateException( throw new IllegalStateException(
"More than one matching members found..."); "More than one matching members found...");
} else { } else {
final PageState state = new PageState(page, request, final PageState state = new PageState(page,
request,
response); response);
profiles.next(); profiles.next();
@ -185,17 +186,22 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet {
createNavigation(profile, root, navPath); createNavigation(profile, root, navPath);
if (navPath == null) { 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"); /*DataCollection relatedLinks = RelatedLink.getRelatedLinks(profile, "NONE");
if (relatedLinks.size() > 0) { if (relatedLinks.size() > 0) {
} }
DataCollection notes = Note.getNotes(profile); DataCollection notes = Note.getNotes(profile);
if (notes.size() > 0) { if (notes.size() > 0) {
} */ } */
} else { } else {
final DataCollection links = final DataCollection links =
RelatedLink.getRelatedLinks(profile, RelatedLink.getRelatedLinks(profile,
@ -270,9 +276,7 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet {
final PublicPersonalProfileXmlGenerator generator = final PublicPersonalProfileXmlGenerator generator =
new PublicPersonalProfileXmlGenerator( new PublicPersonalProfileXmlGenerator(
item); item);
generator.generateXML(new PageState(page, generator.generateXML(state,
request,
response),
root, root,
""); "");
} }
@ -432,7 +436,7 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet {
"titlePost"); "titlePost");
titlePost.setText(owner.getTitlePost()); titlePost.setText(owner.getTitlePost());
} }
if (owner.hasContacts()) { if (owner.hasContacts()) {
final GenericPersonContactCollection contacts = owner.getContacts(); final GenericPersonContactCollection contacts = owner.getContacts();
//final String contactType = config.getContactType(); //final String contactType = config.getContactType();
@ -444,7 +448,7 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet {
contacts.next(); contacts.next();
generateContactXml(profileOwnerElem, generateContactXml(profileOwnerElem,
contacts.getContact(), contacts.getContact(),
state); state);
} }
} }
@ -526,14 +530,15 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet {
final ParameterSingleSelectionModel navItemSelect = final ParameterSingleSelectionModel navItemSelect =
new ParameterSingleSelectionModel( new ParameterSingleSelectionModel(
navItemKeyParam); navItemKeyParam);
page.addGlobalStateParam(navItemKeyParam); page.addGlobalStateParam(navItemKeyParam);
final BoxPanel box = new BoxPanel(BoxPanel.VERTICAL); final BoxPanel box = new BoxPanel(BoxPanel.VERTICAL);
final FormSection tableSection = new FormSection(box); final FormSection tableSection = new FormSection(box);
final PublicPersonalProfileNavItemsAddForm addForm = final PublicPersonalProfileNavItemsAddForm addForm =
new PublicPersonalProfileNavItemsAddForm(navItemSelect); new PublicPersonalProfileNavItemsAddForm(
navItemSelect);
final PublicPersonalProfileNavItemsTable table = final PublicPersonalProfileNavItemsTable table =
new PublicPersonalProfileNavItemsTable( new PublicPersonalProfileNavItemsTable(
navItemSelect); navItemSelect);