Index: openacs-4/packages/dotlrn/www/subcommunity-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/subcommunity-new.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/subcommunity-new.adp	14 Feb 2002 19:43:11 -0000	1.1
+++ openacs-4/packages/dotlrn/www/subcommunity-new.adp	14 Mar 2002 23:49:04 -0000	1.2
@@ -1,4 +1,8 @@
 <master>
 <property name="title">@title@</property>
+<property name="portal_id">@admin_portal_id@</property>
+<property name="show_control_panel">1</property>
+<property name="link_control_panel">1</property>
 
+
 <formtemplate id="add_subcomm"></formtemplate>
Index: openacs-4/packages/dotlrn/www/subcommunity-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/subcommunity-new.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/subcommunity-new.tcl	13 Mar 2002 21:57:03 -0000	1.7
+++ openacs-4/packages/dotlrn/www/subcommunity-new.tcl	14 Mar 2002 23:49:04 -0000	1.8
@@ -10,69 +10,60 @@
     title:onevalue
 }
 
+set user_id [ad_get_user_id]
 set parent_community_id [dotlrn_community::get_community_id]
-
 set title "New [ad_parameter subcommunity_pretty_name]"
+set admin_portal_id \
+        [dotlrn_community::get_portal_template_id $parent_community_id]
 
 form create add_subcomm
 
 element create add_subcomm pretty_name \
     -label "Name" \
     -datatype text \
     -widget text \
-    -html {size 60}
+    -html {size 40}
 
 element create add_subcomm description \
-    -label "Description (Text or HTML)" \
+    -label "Description <br> (Text or HTML)" \
     -datatype text \
     -widget text \
-    -html {size 60}
+    -html {size 40}
 
 element create add_subcomm join_policy \
     -label "Join Policy" \
     -datatype text \
     -widget select \
     -options {{Closed closed} {"Needs Approval" "needs approval"} {Open open}}
 
-element create add_subcomm add_users_now \
-    -label "Add members now? FIXME" \
-    -datatype text \
-    -widget radio \
-    -options {{Yes 1} {No 0}} \
-    -value 0
-
 element create add_subcomm referer \
     -label "Referer" \
     -datatype text \
     -widget hidden \
     -value $referer
 
 if {[form is_valid add_subcomm]} {
-    form get_values add_subcomm  \
-            pretty_name description join_policy add_users_now referer
+    form get_values add_subcomm \
+            pretty_name description join_policy referer 
 
     # we set some extra vars based on the community_type of the parent
     set parent_type  \
             [dotlrn_community::get_community_type_from_community_id \
             $parent_community_id]
-    set extra_vars [ns_set create]
 
-#    ad_return_complaint 1 "pt $parent_type"
-
-    if {$parent_type == "dotlrn_community"} {
-        # we want to make a subcomm of a subcomm
-        # nothing for now
-    } elseif {$parent_type != [dotlrn_club::community_type]} {
+    set extra_vars [ns_set create]
+    ns_set put $extra_vars join_policy $join_policy
+    
+    if {$parent_type != [dotlrn_club::community_type]} {
         # we want to make a subgroup of a class instance
-        # get the term_id, since the subgroup should not outlive the class
+        # get the term_id, since the subgroup should not
+        # outlive the class
         set term_id [dotlrn_class::get_term_id \
                 -class_instance_id $parent_community_id]
         
         ns_set put $extra_vars term_id $term_id
     } 
 
-    ns_set put $extra_vars join_policy $join_policy
-
     db_transaction {
         set subcomm_id [dotlrn_community::new \
                 -parent_community_id $parent_community_id \
@@ -81,16 +72,19 @@
                 -pretty_name $pretty_name \
                 -extra_vars $extra_vars]
         
-
-        # let admins of the parent comm, be admins
+        # let admins of the parent comm, be admins of the subcomm
         set parent_admin_segment_id [dotlrn_community::get_rel_segment_id \
                 -community_id $parent_community_id \
                 -rel_type "dotlrn_admin_rel"]
-
-        # granting admin privs to the admins of the parent comm over the subcomm
         ad_permission_grant $parent_admin_segment_id $subcomm_id admin
 
-        # for a subcomm of a "class" set the start and end dates
+        # add self as admin
+        dotlrn_community::add_user \
+                -rel_type "dotlrn_admin_rel" \
+                $subcomm_id \
+                $user_id
+
+        # for a subcomm of a "class instance" set the start and end dates
         if {![string equal $parent_type [dotlrn_club::community_type]] &&
                  ![string equal $parent_type "dotlrn_community"]} {
 
@@ -103,11 +97,8 @@
         }
     }
 
-    if {$add_users_now} {
-        ad_returnredirect "users-add-to-community?foobar"
-    } else {
-        ad_returnredirect $referer
-    }
+    # redirect to the member page of the new sub comm (for adding)
+    ad_returnredirect "[dotlrn_community::get_community_key -community_id $subcomm_id]/members?referer=$referer"
 
     ad_script_abort
 }