Index: openacs-4/packages/imsld/tcl/imsld-condition-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-condition-procs.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/imsld/tcl/imsld-condition-procs.tcl	20 Sep 2006 08:26:30 -0000	1.15
+++ openacs-4/packages/imsld/tcl/imsld-condition-procs.tcl	20 Sep 2006 15:04:05 -0000	1.16
@@ -189,7 +189,6 @@
     dom parse $when_prop_val_is_set_xml document
     $document documentElement when_prop_val_is_set_root
     set wpv_is_node [$when_prop_val_is_set_root childNodes]
-#    set wpv_is_node [$statement childNodes]
     
     set equal_value_p 0
     # get the property value
@@ -280,8 +279,10 @@
             }
         }
         if { [db_0or1row support_activity_p {
-            select 'support' as activity_type
-            from imsld_support_activities
+            select 'support' as activity_type,
+            item_id as activity_item_id,
+            activity_id
+            from imsld_support_activitiesi
             where complete_act_id = :complete_act_item_id
             and content_revision__is_live(activity_id) = 't'
         }] } {
Index: openacs-4/packages/imsld/www/imsld-content-serve.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/imsld-content-serve.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/imsld/www/imsld-content-serve.tcl	20 Sep 2006 08:26:30 -0000	1.8
+++ openacs-4/packages/imsld/www/imsld-content-serve.tcl	20 Sep 2006 15:04:05 -0000	1.9
@@ -16,6 +16,7 @@
 if { [string eq $owner_user_id ""] } {
     set owner_user_id [ad_conn user_id]
 }
+
 # get file info
 db_1row get_info {
     select f.revision_id,
@@ -312,6 +313,13 @@
         $form_node appendChild $input_text_node
     } 
 
+    # adding owner info
+    set owner_node [$dom_doc createElement "input"]
+    $owner_node setAttribute name "owner_id"
+    $owner_node setAttribute type "hidden"
+    $owner_node setAttribute value "$owner_user_id"
+    $form_node appendChild $owner_node
+
     # adding return url
     set return_url_node [$dom_doc createElement "input"]
     $return_url_node setAttribute name "return_url"
@@ -464,6 +472,13 @@
 
     set parent_node [$set_property_group_node parentNode]
 
+    # adding owner info
+    set owner_node [$dom_doc createElement "input"]
+    $owner_node setAttribute name "owner_id"
+    $owner_node setAttribute type "hidden"
+    $owner_node setAttribute value "$owner_user_id"
+    $form_node appendChild $owner_node
+
     # adding return url
     set return_url_node [$dom_doc createElement "input"]
     $return_url_node setAttribute name "return_url"
Index: openacs-4/packages/imsld/www/imsld-finish-resource.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/imsld-finish-resource.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/imsld/www/imsld-finish-resource.tcl	19 Jul 2006 15:30:13 -0000	1.8
+++ openacs-4/packages/imsld/www/imsld-finish-resource.tcl	20 Sep 2006 15:04:05 -0000	1.9
@@ -9,7 +9,7 @@
     owner_user_id:optional
 }
 
-# fedback nor assessment has to be marked as finished
+# fedback, assessment nor imsldcontent have to be marked as finished
 if { [db_0or1row not_fedbk_nor_assmnt { 
     select icr.resource_id
     from acs_rels ar,
@@ -18,6 +18,7 @@
     and icr.item_id = ar.object_id_two
     and ar.object_id_two = :resource_item_id
     and icr.type != 'imsqti_xmlv1p0'
+    and icr.type != 'imsldcontent'
     limit 1
 }] } {
     imsld::grant_permissions -resources_activities_list $resource_id -user_id [ad_conn user_id]
Index: openacs-4/packages/imsld/www/properties-value-set.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/properties-value-set.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/imsld/www/properties-value-set.tcl	4 Jul 2006 18:06:03 -0000	1.2
+++ openacs-4/packages/imsld/www/properties-value-set.tcl	20 Sep 2006 15:04:05 -0000	1.3
@@ -5,6 +5,7 @@
 } {
     instances_ids:array,notnull
     return_url
+    owner_id
 } -validate {
     no_instance {
         if { [array size instances_ids] == 0 } {
@@ -23,7 +24,7 @@
             from imsld_property_instances
             where instance_id = :instance_id
         }
-        imsld::runtime::property::property_value_set -run_id $run_id -user_id [ad_conn user_id] -value $value -property_id $property_id
+        imsld::runtime::property::property_value_set -run_id $run_id -user_id $owner_id -value $value -property_id $property_id
     }
 }
 
Index: openacs-4/packages/imsld/www/support-activity-roles.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/support-activity-roles.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/imsld/www/support-activity-roles.adp	25 Jul 2006 17:28:18 -0000	1.2
+++ openacs-4/packages/imsld/www/support-activity-roles.adp	20 Sep 2006 15:04:05 -0000	1.3
@@ -5,13 +5,23 @@
 <select name="role_id" id="supported-roles" onChange="confirmValue(this.form)">
     <option value="select">Select role to support...</option>
     <multiple name="role_info">
+        <if @role_id@ eq @role_info.role_id@ and @supported_user_id@ not nil>
+        <option value="@role_info.role_id@" selected="selected">@role_info.role_name@</option>
+        </if>
+        <else>
         <option value="@role_info.role_id@">@role_info.role_name@</option>
+        </else>
     </multiple>
 </select>
 <select name="supported_user_id" id="user-roles" onChange="confirmValue(this.form)">
     <option class="select" value="select">Select user to support...</option>
     <multiple name="supported_users_in_role">
+    <if @supported_user_id@ eq @supported_users_in_role.member_id@>
+    <option class="@supported_users_in_role.role_id@" value="@supported_users_in_role.member_id@" selected="selected">@supported_users_in_role.username@</option>
+    </if>
+    <else>
     <option class="@supported_users_in_role.role_id@" value="@supported_users_in_role.member_id@">@supported_users_in_role.username@</option>
+    </else>
     </multiple>
 </select>
 </div>
Index: openacs-4/packages/imsld/www/support-activity-roles.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/support-activity-roles.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/imsld/www/support-activity-roles.tcl	25 Jul 2006 17:28:18 -0000	1.4
+++ openacs-4/packages/imsld/www/support-activity-roles.tcl	20 Sep 2006 15:04:05 -0000	1.5
@@ -13,7 +13,7 @@
 }
 
 set users_in_role [list]
-    set counter 0
+set counter 0
 foreach instances_group $supported_role_instances {
     set users_in_instance [list]
     foreach instance $instances_group {
@@ -28,8 +28,7 @@
         set username [join [db_list_of_lists get_user_name "select first_names, last_name from dotlrn_users where user_id=$member_id"]]
 
     }
-        set counter [expr $counter + 1]
-
+    set counter [expr $counter + 1]
    
 }