Index: openacs-4/packages/survey-portlet/www/survey-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey-portlet/www/survey-portlet.adp,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/survey-portlet/www/survey-portlet.adp	15 Dec 2006 22:45:44 -0000	1.4
+++ openacs-4/packages/survey-portlet/www/survey-portlet.adp	16 Feb 2007 18:46:21 -0000	1.4.2.1
@@ -18,10 +18,12 @@
 
 %>
 
+<if @config.shaded_p@ ne "t">
+
 <if @surveys:rowcount@ gt 0 and @readable_surveys_p@ eq 1>
 	<multiple name="surveys">
-<if @one_instance_p@ false>@surveys.parent_name@</if>
-<ul>
+         <if @one_instance_p@ false>@surveys.parent_name@</if>
+         <ul>
 
 <group column="package_id">
     <if @surveys.response_count@ eq 0 and @surveys.can_read_private_data_p@>
@@ -38,3 +40,6 @@
 	<small>#survey.No_unanswered_surveys#</small>
 </else>
 </if>
+<else>
+  <small>#new-portal.when_portlet_shaded#</small>
+</else>
Index: openacs-4/packages/workflow/sql/postgresql/upgrade/upgrade-1.2-2.0d1.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/sql/postgresql/upgrade/upgrade-1.2-2.0d1.sql,v
diff -u -r1.14 -r1.14.6.1
--- openacs-4/packages/workflow/sql/postgresql/upgrade/upgrade-1.2-2.0d1.sql	24 Feb 2005 13:33:28 -0000	1.14
+++ openacs-4/packages/workflow/sql/postgresql/upgrade/upgrade-1.2-2.0d1.sql	16 Feb 2007 18:50:52 -0000	1.14.6.1
@@ -176,7 +176,17 @@
 
 -- Adding unique constraint on workflow fsm enabled in actions
 -- This could cause upgrades to fail, if there are in fact duplicates, so let's pray that there aren't
--- alter table workflow_fsm_action_en_in_st add constraint workflow_fsm_action_en_in_st_pk primary key (action_id, state_id);
+-- Nima: Therefore we remove duplicates
+delete from workflow_fsm_action_en_in_st
+        where oid in (
+                select w1.oid from workflow_fsm_action_en_in_st w1, workflow_fsm_action_en_in_st w2
+                        where   w1.action_id = w2.action_id and
+                                w1.state_id = w2.state_id and
+                                w1.oid <> w2.oid and
+                                w1.assigned_p = 'f'
+                );
+-- Nima: and now we uncomment this:
+alter table workflow_fsm_action_en_in_st add constraint workflow_fsm_action_en_in_st_pk primary key (action_id, state_id);
 
 -- Workflow deputies should use timestamp, not date
 alter table workflow_deputies rename column start_date to start_date_old;
Index: openacs-4/packages/workflow/tcl/workflow-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/workflow-procs-postgresql.xql,v
diff -u -r1.8 -r1.8.10.1
--- openacs-4/packages/workflow/tcl/workflow-procs-postgresql.xql	23 Jan 2004 11:02:27 -0000	1.8
+++ openacs-4/packages/workflow/tcl/workflow-procs-postgresql.xql	16 Feb 2007 18:50:53 -0000	1.8.10.1
@@ -10,8 +10,8 @@
              w.object_id,
              w.package_key,
              w.object_type,
-             w.description,
-             w.description_mime_type,
+             a.description,
+             a.description_mime_type,
              a.short_name as initial_action,
              a.action_id as initial_action_id
       from   workflows w left outer join