From 2b0ddd180d3d6f7243fd886373956c59178aba7b Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 27 Aug 2010 13:58:35 +0000
Subject: [PATCH] Publications Modul: Aktueller Stand.

git-svn-id: https://svn.libreccm.org/ccm/trunk@518 8810af33-2d31-482b-a856-94f89814c4df
---
 .../ui/ProjectPropertiesStep.java             | 35 +++++++++++++++++++
 ccm-sci-publications/application.xml          |  2 +-
 .../com/arsdigita/content-types/Series.pdl    |  2 +-
 .../ccm-sci-publications/postgres-create.sql  |  1 +
 4 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 ccm-cms-types-project/src/com/arsdigita/cms/contenttypes/ui/ProjectPropertiesStep.java

diff --git a/ccm-cms-types-project/src/com/arsdigita/cms/contenttypes/ui/ProjectPropertiesStep.java b/ccm-cms-types-project/src/com/arsdigita/cms/contenttypes/ui/ProjectPropertiesStep.java
new file mode 100644
index 000000000..7de39e523
--- /dev/null
+++ b/ccm-cms-types-project/src/com/arsdigita/cms/contenttypes/ui/ProjectPropertiesStep.java
@@ -0,0 +1,35 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.arsdigita.cms.contenttypes.ui;
+
+import com.arsdigita.cms.ItemSelectionModel;
+import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
+
+/**
+ *
+ * @author Jens Pelzetter
+ */
+public class ProjectPropertiesStep
+        extends GenericOrganizationalUnitPropertiesStep {
+
+    public ProjectPropertiesStep(ItemSelectionModel itemModel,
+                                 AuthoringKitWizard parent) {
+        super(itemModel, parent);
+    }
+
+    @Override
+    protected void addSteps(ItemSelectionModel itemModel,
+                            AuthoringKitWizard parent) {
+        addStep(new GenericOrganizationalUnitContactPropertiesStep(itemModel,
+                                                                   parent),
+                "cms.contenttypes.ui.orgaunit.contact");
+        addStep(new ProjectSubprojectPropertiesStep(itemModel,
+                                                    parent),
+                "cms.contenttypes.ui.project.subprojects");
+        addStep(new GenericOrganizationalUnitPersonPropertiesStep(itemModel,
+                                                                  parent),
+                "cms.contenttypes.ui.orgaunit.persons");
+    }
+}
diff --git a/ccm-sci-publications/application.xml b/ccm-sci-publications/application.xml
index 74cc25d45..5a331ec7e 100644
--- a/ccm-sci-publications/application.xml
+++ b/ccm-sci-publications/application.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-  name="ccm-cms-types-organization"
+  name="ccm-sci-publications"
   prettyName="OpenCCM Content Types"
   version="6.6.0"
   release="1"
diff --git a/ccm-sci-publications/pdl/com/arsdigita/content-types/Series.pdl b/ccm-sci-publications/pdl/com/arsdigita/content-types/Series.pdl
index 5cf0992ff..8aba3807c 100644
--- a/ccm-sci-publications/pdl/com/arsdigita/content-types/Series.pdl
+++ b/ccm-sci-publications/pdl/com/arsdigita/content-types/Series.pdl
@@ -48,7 +48,7 @@ association {
 
 	    //Sorting is first done by the period defined by from and to,
 	    //and secondly by the following order attribute
-	    Integer[0..1] editor_order = ct_series_editship.order INTEGER;
+	    Integer[0..1] editor_order = ct_series_editship.editship_order INTEGER;
 }
 
 //Assoication for the volumes in the series
diff --git a/ccm-sci-publications/sql/ccm-sci-publications/postgres-create.sql b/ccm-sci-publications/sql/ccm-sci-publications/postgres-create.sql
index a733590e2..38716a0ca 100644
--- a/ccm-sci-publications/sql/ccm-sci-publications/postgres-create.sql
+++ b/ccm-sci-publications/sql/ccm-sci-publications/postgres-create.sql
@@ -1,3 +1,4 @@
 begin;
 \i ddl/postgres/create.sql
+\i ddl/postgres/deferred.sql
 end;
\ No newline at end of file