Index: openacs-4/packages/cms/todo =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/todo,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/cms/todo 16 May 2005 22:59:23 -0000 1.6 +++ openacs-4/packages/cms/todo 17 May 2005 21:25:08 -0000 1.7 @@ -28,7 +28,7 @@ top priority ------------ set up install procs that set contexts appropriately (done, not thoroughly tested) -fix child items include +clean up www/modules/items/relate-items (remove old table format) basic/cosmetic --------- Index: openacs-4/packages/cms/tcl/form-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/form-procs-oracle.xql,v diff -u -N -r1.16 -r1.17 --- openacs-4/packages/cms/tcl/form-procs-oracle.xql 17 May 2003 10:23:15 -0000 1.16 +++ openacs-4/packages/cms/tcl/form-procs-oracle.xql 17 May 2005 21:25:08 -0000 1.17 @@ -97,8 +97,8 @@ mime_type => :mime_type, text => ' ', item_id => content_symlink.resolve(:item_id), - creation_ip => '[ns_conn peeraddr]', - creation_user => [User::getID] + creation_ip => null, + creation_user => null ); end; @@ -312,8 +312,8 @@ item_id => content_symlink.resolve(:item_id), revision_id => :revision_id, title => :title, - creation_ip => :creation_ip, - creation_user => :creation_user $param_sql); end; + creation_ip => null, + creation_user => null $param_sql); end; Index: openacs-4/packages/cms/tcl/form-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/form-procs-postgresql.xql,v diff -u -N -r1.20 -r1.21 --- openacs-4/packages/cms/tcl/form-procs-postgresql.xql 17 May 2003 10:23:15 -0000 1.20 +++ openacs-4/packages/cms/tcl/form-procs-postgresql.xql 17 May 2005 21:25:08 -0000 1.21 @@ -92,7 +92,7 @@ - select content_revision__new(:title,:description,:mime_type,' ',content_symlink__resolve(:item_id),'[ns_conn peeraddr]',[User::getID]) as revision_id + select content_revision__new(:title,:description,:mime_type,' ',content_symlink__resolve(:item_id),null,null) as revision_id @@ -167,10 +167,10 @@ :parent_id, :item_id, :locale, - now(), - [User::getID], + current_timestamp, null, - '[ns_conn peeraddr]', + null, + null, 'content_item', :content_type, null, @@ -363,15 +363,15 @@ select content_revision__new( :title, :description, - now(), + current_timestamp, :mime_type, null, :text, content_symlink__resolve(:item_id), :revision_id, - now(), - :creation_user, - :creation_ip) + current_timestamp, + null, + null) Index: openacs-4/packages/cms/tcl/form-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/form-procs.tcl,v diff -u -N -r1.26 -r1.27 --- openacs-4/packages/cms/tcl/form-procs.tcl 13 Apr 2005 19:02:24 -0000 1.26 +++ openacs-4/packages/cms/tcl/form-procs.tcl 17 May 2005 21:25:08 -0000 1.27 @@ -378,22 +378,9 @@ template::form get_values $form_name title description mime_type # create the basic revision - set revision_id [db_exec_plsql new_content_revision " - begin - :1 := content_revision.new( - title => :title, - description => :description, - mime_type => :mime_type, - text => ' ', - item_id => content_symlink.resolve(:item_id), - creation_ip => '[ns_conn peeraddr]', - creation_user => [User::getID] - ); - end;"] + set revision_id [db_exec_plsql new_content_revision {}] - # query for extended attribute tables - set last_table "" set last_id_column "" db_multirow rows get_extended_attributes "" @@ -676,8 +663,8 @@ } } - lappend params "creation_user => [User::getID]" - lappend params "creation_ip => '[ns_conn peeraddr]'" + lappend params "creation_user => null" + lappend params "creation_ip => null" lappend params "storage_type => :storage_type" # Use the correct relation tag, if specified @@ -789,15 +776,13 @@ } { # get creation_user and creation_ip - set creation_user [User::getID] - set creation_ip [ns_conn peeraddr] - ns_set put $bind_vars creation_user $creation_user - ns_set put $bind_vars creation_ip $creation_ip + ns_set put $bind_vars creation_user null + ns_set put $bind_vars creation_ip null # initialize the column and value list set columns [list item_id revision_id creation_user creation_ip] - set values [list :item_id :revision_id :creation_user :creation_ip] + set values [list :item_id :revision_id null null] set default_columns [list] set default_values [list] set missing_columns [list] @@ -1970,9 +1955,6 @@ template::util::get_opts $args - set creation_ip [ns_conn peeraddr] - set creation_user [User::getID] - set param_sql "" array set defaults [list description "" mime_type "text/plain" text " "] foreach param { description mime_type text } { @@ -1987,12 +1969,7 @@ db_transaction { - set revision_id [db_exec_plsql basic_get_revision_id "begin :1 := content_revision.new( - item_id => content_symlink.resolve(:item_id), - revision_id => :revision_id, - title => :title, - creation_ip => :creation_ip, - creation_user => :creation_user $param_sql); end;"] + set revision_id [db_exec_plsql basic_get_revision_id {}] if { [info exists opts(tmpfile)] } { Index: openacs-4/packages/cms/www/modules/items/children.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/children.adp,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/cms/www/modules/items/children.adp 16 May 2005 22:59:24 -0000 1.6 +++ openacs-4/packages/cms/www/modules/items/children.adp 17 May 2005 21:25:08 -0000 1.7 @@ -1,87 +1,11 @@ - - - +

- - -

- - - - - - - - - - - - -
Child Items - - -  
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
No child items.  Content Type  Title  Relationship TypeRelation Tag 
-   - @children.content_type@   - @children.title@ - -  @children.type_name@@children.tag@ - - - - -
-
-
- -   -
- -
- - - - - + + + Add a new child item + + + + Index: openacs-4/packages/cms/www/modules/items/children.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/children.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/cms/www/modules/items/children.tcl 16 May 2005 22:59:24 -0000 1.6 +++ openacs-4/packages/cms/www/modules/items/children.tcl 17 May 2005 21:25:08 -0000 1.7 @@ -10,19 +10,18 @@ permission::require_permission -party_id $user_id \ -object_id $item_id -privilege read -# create a form to add child items - +# create a form to add child items... set child_types [db_list_of_lists get_child_types ""] -# do not display template if this content type does not allow children -if { [llength $child_types] == 0 } { adp_abort } +# but do not display form if this content type does not allow children +set child_types_registered_p [llength $child_types] if { [permission::permission_p -party_id $user_id -object_id $item_id -privilege write] } { - form create add_child -method get -action "create-1" - element create add_child parent_id -datatype integer \ - -widget hidden -value $item_id - element create add_child content_type -datatype keyword \ - -options $child_types -widget select + form create add_child -method get -action create-1 + element create add_child parent_id -datatype integer \ + -widget hidden -value $item_id + element create add_child content_type -datatype keyword \ + -options $child_types -widget select } template::list::create \ @@ -42,25 +41,23 @@ } title_url { label "Title" - display_template "@related.title@" + display_template "@children.title@" } type_name { label "Relationship Type" } - relation_view_url { + tag { label "Tag" - display_template "@related.tag@" } reorder { label "Move" - display_template "up  |  \ - down" + display_template "up  |  \ + down" } } db_multirow -extend { title_url relation_view_url move_up_url move_down_url reorder } children get_children "" { set title_url "index?item_id=$item_id&mount_point=$mount_point" - set relation_view_url "relationship-view?rel_id=$rel_id&mount_point=$mount_point" set move_up_url "relate-order?rel_id=$rel_id&order=up&mount_point=$mount_point&item_props_tab=children&relation_type=relation" set move_down_url "relate-order?rel_id=$rel_id&order=down&mount_point=$mount_point&item_props_tab=children&relation_type=relation" } Index: openacs-4/packages/cms/www/modules/items/item-header.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/item-header.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/cms/www/modules/items/item-header.xql 17 May 2005 21:25:08 -0000 1.1 @@ -0,0 +1,19 @@ + + + + + + + select + i.content_type, i.latest_revision, r.title, r.description + from + cr_items i, cr_revisions r + where + i.item_id = :item_id + and + r.revision_id = content_item__get_best_revision(:item_id) + + + + + \ No newline at end of file Index: openacs-4/packages/cms/www/modules/items/relate-items-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/relate-items-2.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/cms/www/modules/items/relate-items-2.tcl 13 Apr 2005 20:15:19 -0000 1.7 +++ openacs-4/packages/cms/www/modules/items/relate-items-2.tcl 17 May 2005 21:25:08 -0000 1.8 @@ -143,7 +143,7 @@ } } - template::forward "index?item_id=$item_id&mount_point=$mount_point" + template::forward "index?item_id=$item_id&mount_point=$mount_point&item_props_tab=related" } Index: openacs-4/packages/cms/www/modules/items/relate-items.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/relate-items.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/cms/www/modules/items/relate-items.tcl 13 Apr 2005 20:15:19 -0000 1.5 +++ openacs-4/packages/cms/www/modules/items/relate-items.tcl 17 May 2005 21:25:08 -0000 1.6 @@ -1,8 +1,8 @@ # This form will list all currently marked content items # and confirm that the user wishes to link them all to the current item request create -params { - item_id -datatype integer - mount_point -datatype keyword -value sitemap + item_id -datatype integer + mount_point -datatype keyword -value sitemap } permission::require_permission -party_id [auth::require_login] \ Index: openacs-4/packages/cms/www/modules/items/related-items.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/related-items.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/cms/www/modules/items/related-items.tcl 16 May 2005 22:59:24 -0000 1.6 +++ openacs-4/packages/cms/www/modules/items/related-items.tcl 17 May 2005 21:25:08 -0000 1.7 @@ -4,9 +4,24 @@ item_props_tab -datatype text -optional } -permission::require_permission -party_id [auth::require_login] \ +set user_id [auth::require_login] +permission::require_permission -party_id $user_id \ -object_id $item_id -privilege read +# # create a form to add related items... +# set related_types [db_list_of_lists get_related_types ""] + +# # but do not display form if this content type does not allow relations +# set related_types_registered_p [llength $related_types] + +# if { [permission::permission_p -party_id $user_id -object_id $item_id -privilege write] } { +# form create add_related_item -method get -action create-1 +# element create add_related_item parent_id -datatype integer \ +# -widget hidden -value $item_id +# element create add_related_item content_type -datatype keyword \ +# -options $related_types -widget select +# } + template::list::create \ -name related \ -key rel_id \ Index: openacs-4/packages/cms/www/modules/items/related-items.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/related-items.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/cms/www/modules/items/related-items.xql 17 May 2005 21:25:08 -0000 1.1 @@ -0,0 +1,21 @@ + + + + + + +select + pretty_name, target_type, relation_tag, min_n, max_n + from + cr_type_relations r, acs_object_types o + where + o.object_type = r.target_type + and + r.content_type = content_item__get_content_type(:item_id) + order by + pretty_name, relation_tag; + + + + + Index: openacs-4/packages/cms/www/modules/items/unrelate-item.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/unrelate-item.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/cms/www/modules/items/unrelate-item.tcl 16 May 2005 22:59:24 -0000 1.8 +++ openacs-4/packages/cms/www/modules/items/unrelate-item.tcl 17 May 2005 21:25:08 -0000 1.9 @@ -27,4 +27,4 @@ } set item_props_tab related -ad_returnredirect [export_vars -base $return_url {item_props_tab mount_pount item_props_tab}] +ad_returnredirect [export_vars -base $return_url {item_id mount_pount item_props_tab}] Index: openacs-4/packages/cms/www/modules/types/relation-register.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relation-register.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/cms/www/modules/types/relation-register.tcl 16 May 2005 17:38:19 -0000 1.7 +++ openacs-4/packages/cms/www/modules/types/relation-register.tcl 17 May 2005 21:25:08 -0000 1.8 @@ -1,7 +1,7 @@ request create request set_param rel_type -datatype keyword request set_param content_type -datatype text -value content_revision -request set_param type_props_tab -datatype text -optional -value attributes +request set_param type_props_tab -datatype text -optional -value relations permission::require_permission -party_id [auth::require_login] \ -object_id [cm::modules::get_module_id -module_name types -package_id [ad_conn package_id]] -privilege write @@ -94,5 +94,5 @@ } } - template::forward "index?id=$content_type&type_props_tab=relations" + ad_returnredirect [export_vars -base index {content_type type_props_tab}] }