From d1c2817534b696d15a35574201136db01a511551 Mon Sep 17 00:00:00 2001 From: jensp Date: Mon, 11 Jul 2011 06:45:57 +0000 Subject: [PATCH] Weitere Umbenunngen in ccm-sci-publicpersonalprofile git-svn-id: https://svn.libreccm.org/ccm/trunk@998 8810af33-2d31-482b-a856-94f89814c4df --- .../content-types/PersonalInformationPage.pdl | 25 ------------------- .../content-types/PublicPersonalProfile.pdl | 25 +++++++++++++++++++ .../postgres-create.sql | 0 .../ccm-sci-personalinformationpage.config | 7 ------ .../src/ccm-sci-publicpersonalprofile.config | 7 ++++++ ...oad => ccm-sci-publicpersonalprofile.load} | 12 ++++----- .../SciPublicPersonalProfile.xsl} | 8 +++--- 7 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 ccm-sci-publicpersonalprofile/pdl/com/arsdigita/content-types/PersonalInformationPage.pdl create mode 100644 ccm-sci-publicpersonalprofile/pdl/com/arsdigita/content-types/PublicPersonalProfile.pdl rename ccm-sci-publicpersonalprofile/sql/{ccm-sci-personalinformationpage => ccm-sci-publicpersonalprofile}/postgres-create.sql (100%) delete mode 100644 ccm-sci-publicpersonalprofile/src/ccm-sci-personalinformationpage.config create mode 100644 ccm-sci-publicpersonalprofile/src/ccm-sci-publicpersonalprofile.config rename ccm-sci-publicpersonalprofile/src/{ccm-sci-personalinformationpage.load => ccm-sci-publicpersonalprofile.load} (54%) rename ccm-sci-publicpersonalprofile/web/static/content-types/com/arsdigita/cms/{SciPersonalInformationPage.xsl => contenttypes/SciPublicPersonalProfile.xsl} (65%) diff --git a/ccm-sci-publicpersonalprofile/pdl/com/arsdigita/content-types/PersonalInformationPage.pdl b/ccm-sci-publicpersonalprofile/pdl/com/arsdigita/content-types/PersonalInformationPage.pdl deleted file mode 100644 index 244b0fc1a..000000000 --- a/ccm-sci-publicpersonalprofile/pdl/com/arsdigita/content-types/PersonalInformationPage.pdl +++ /dev/null @@ -1,25 +0,0 @@ -model com.arsdigita.cms.contenttypes; - -import com.arsdigita.kernel.ACSObject; -import com.arsdigita.cms.*; - -object type PersonalInformationPage extends ContentPage { - - String homepageUrl = homepage_url VARCHAR(256); - - 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-publicpersonalprofile/pdl/com/arsdigita/content-types/PublicPersonalProfile.pdl b/ccm-sci-publicpersonalprofile/pdl/com/arsdigita/content-types/PublicPersonalProfile.pdl new file mode 100644 index 000000000..d0bed321e --- /dev/null +++ b/ccm-sci-publicpersonalprofile/pdl/com/arsdigita/content-types/PublicPersonalProfile.pdl @@ -0,0 +1,25 @@ +model com.arsdigita.cms.contenttypes; + +import com.arsdigita.kernel.ACSObject; +import com.arsdigita.cms.*; + +object type PublicPersonalProfile extends ContentPage { + + String homepageUrl = homepage_url VARCHAR(256); + + reference key (ct_public_personal_profiles.profile_id); +} + +association { + + PublicPersonalProfile[0..n] profile = join ct_sciorga_members.member_id + to ct_public_personal_profile_owner_map.owner_id, + join ct_public_personal_profile_owner_map.profile_id + to ct_public_personal_profile.profile_id; + + SciMember[0..n] owner = join ct_public_personal_profile.profile_id + to ct_public_personal_profile_owner_map.profile_id, + join ct_public_personal_profile_owner_map.owner_id + to ct_sciorga_members.member_id +} + diff --git a/ccm-sci-publicpersonalprofile/sql/ccm-sci-personalinformationpage/postgres-create.sql b/ccm-sci-publicpersonalprofile/sql/ccm-sci-publicpersonalprofile/postgres-create.sql similarity index 100% rename from ccm-sci-publicpersonalprofile/sql/ccm-sci-personalinformationpage/postgres-create.sql rename to ccm-sci-publicpersonalprofile/sql/ccm-sci-publicpersonalprofile/postgres-create.sql diff --git a/ccm-sci-publicpersonalprofile/src/ccm-sci-personalinformationpage.config b/ccm-sci-publicpersonalprofile/src/ccm-sci-personalinformationpage.config deleted file mode 100644 index 5e9507aed..000000000 --- a/ccm-sci-publicpersonalprofile/src/ccm-sci-personalinformationpage.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/ccm-sci-publicpersonalprofile/src/ccm-sci-publicpersonalprofile.config b/ccm-sci-publicpersonalprofile/src/ccm-sci-publicpersonalprofile.config new file mode 100644 index 000000000..a99e7b248 --- /dev/null +++ b/ccm-sci-publicpersonalprofile/src/ccm-sci-publicpersonalprofile.config @@ -0,0 +1,7 @@ + + + + diff --git a/ccm-sci-publicpersonalprofile/src/ccm-sci-personalinformationpage.load b/ccm-sci-publicpersonalprofile/src/ccm-sci-publicpersonalprofile.load similarity index 54% rename from ccm-sci-publicpersonalprofile/src/ccm-sci-personalinformationpage.load rename to ccm-sci-publicpersonalprofile/src/ccm-sci-publicpersonalprofile.load index 46a94bb92..bf5d0268e 100644 --- a/ccm-sci-publicpersonalprofile/src/ccm-sci-personalinformationpage.load +++ b/ccm-sci-publicpersonalprofile/src/ccm-sci-publicpersonalprofile.load @@ -10,16 +10,16 @@ - - - + + + - - - + + \ No newline at end of file diff --git a/ccm-sci-publicpersonalprofile/web/static/content-types/com/arsdigita/cms/SciPersonalInformationPage.xsl b/ccm-sci-publicpersonalprofile/web/static/content-types/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.xsl similarity index 65% rename from ccm-sci-publicpersonalprofile/web/static/content-types/com/arsdigita/cms/SciPersonalInformationPage.xsl rename to ccm-sci-publicpersonalprofile/web/static/content-types/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.xsl index 6e66e679b..e35c529a5 100644 --- a/ccm-sci-publicpersonalprofile/web/static/content-types/com/arsdigita/cms/SciPersonalInformationPage.xsl +++ b/ccm-sci-publicpersonalprofile/web/static/content-types/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.xsl @@ -6,13 +6,13 @@ xmlns:cms="http://www.arsdigita.com/cms/1.0" version="1.0"> - +

- +