diff --git a/ccm-cms/src/com/arsdigita/cms/Folder.java b/ccm-cms/src/com/arsdigita/cms/Folder.java index 20dc4aaf9..e57f57016 100755 --- a/ccm-cms/src/com/arsdigita/cms/Folder.java +++ b/ccm-cms/src/com/arsdigita/cms/Folder.java @@ -625,6 +625,12 @@ public class Folder extends ContentItem { /** * Convenience Constructor that always sorts the collection * by isFolder and ID + * + * jensp 2011-06: I changed this because this silly sorting affects + * the ItemSearchWidget and makes it pretty useless... I've not noticed + * any negative effects, so it seams no problem. Sorting is now set by + * the caller/user of the {@code ItemCollection}. + * * @param query the Data Query to use to retrieve the collection */ public ItemCollection(DataQuery query) { diff --git a/ccm-sci-personalinformationpage/application.xml b/ccm-sci-personalinformationpage/application.xml new file mode 100644 index 000000000..5b80d01be --- /dev/null +++ b/ccm-sci-personalinformationpage/application.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + Aggreates informations about a SciMember item. In the content center it provides + a form for editing the contact associates with the SciMember item. Also a form + is provided to link articles or other content items with a person. The view is + provided by an special content panel for SciMember which has to be added + to the template of the SciMember content type (an example JSP is provided + with this module). + + diff --git a/ccm-sci-personalinformationpage/pdl/com/arsdigita/content-types/PersonalInformationPage.pdl b/ccm-sci-personalinformationpage/pdl/com/arsdigita/content-types/PersonalInformationPage.pdl new file mode 100644 index 000000000..e95f4fcf1 --- /dev/null +++ b/ccm-sci-personalinformationpage/pdl/com/arsdigita/content-types/PersonalInformationPage.pdl @@ -0,0 +1,24 @@ +model com.arsdigita.cms.contenttypes; + +import com.arsdigita.kernel.ACSObject; +import com.arsdigita.cms.*; + +object type PersonalInformationPage extends ContentPage { + + + reference key (ct_personal_information_pages.personal_information_page_id); +} + +association { + + PersonalInformationPage[0..n] personalInformationPage = join ct_sciorga_members.member_id + to ct_personal_information_page_owner_map.owner_id, + join ct_personal_information_page_owner_map.personal_information_page_id + to ct_personal_information_pages.personal_information_page_id; + + SciMember[0..n] owner = join ct_personal_information_pages.personal_information_page_id + to ct_personal_information_page_owner_map.personal_information_page_id, + join ct_personal_information_page_owner_map.owner_id + to ct_sciorga_members.member_id +} + diff --git a/ccm-sci-personalinformationpage/sql/ccm-sci-personalinformationpage/postgres-create.sql b/ccm-sci-personalinformationpage/sql/ccm-sci-personalinformationpage/postgres-create.sql new file mode 100644 index 000000000..38716a0ca --- /dev/null +++ b/ccm-sci-personalinformationpage/sql/ccm-sci-personalinformationpage/postgres-create.sql @@ -0,0 +1,4 @@ +begin; +\i ddl/postgres/create.sql +\i ddl/postgres/deferred.sql +end; \ No newline at end of file diff --git a/ccm-sci-personalinformationpage/src/ccm-sci-personalinformationpage.config b/ccm-sci-personalinformationpage/src/ccm-sci-personalinformationpage.config new file mode 100644 index 000000000..5e9507aed --- /dev/null +++ b/ccm-sci-personalinformationpage/src/ccm-sci-personalinformationpage.config @@ -0,0 +1,7 @@ + + + + diff --git a/ccm-sci-personalinformationpage/src/ccm-sci-personalinformationpage.load b/ccm-sci-personalinformationpage/src/ccm-sci-personalinformationpage.load new file mode 100644 index 000000000..46a94bb92 --- /dev/null +++ b/ccm-sci-personalinformationpage/src/ccm-sci-personalinformationpage.load @@ -0,0 +1,25 @@ + + + +
+
+
+
+
+
+
+ + + + + + + + + + + + \ No newline at end of file diff --git a/ccm-sci-personalinformationpage/web/static/content-types/com/arsdigita/cms/SciPersonalInformationPage.xsl b/ccm-sci-personalinformationpage/web/static/content-types/com/arsdigita/cms/SciPersonalInformationPage.xsl new file mode 100644 index 000000000..6e66e679b --- /dev/null +++ b/ccm-sci-personalinformationpage/web/static/content-types/com/arsdigita/cms/SciPersonalInformationPage.xsl @@ -0,0 +1,19 @@ + +]> + + + + +

+
+ + +

+
+ +
\ No newline at end of file