Index: openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl,v diff -u -r1.148.2.1 -r1.148.2.2 --- openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl 23 Feb 2019 18:46:22 -0000 1.148.2.1 +++ openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl 5 Mar 2019 10:20:09 -0000 1.148.2.2 @@ -2743,7 +2743,43 @@ ::xo::db::Object slots { ::xo::db::Attribute create object_id -pretty_name "Object ID" -datatype integer #::xo::db::Attribute create object_type -pretty_name "Object Type" - ::xo::db::Attribute create object_title -pretty_name "Object Title" -column_name title + ::xo::db::Attribute create object_title \ + -pretty_name "Object Title" \ + -column_name title + ::xo::db::Attribute create context_id \ + -pretty_name "Context ID" \ + -datatype integer \ + -column_name context_id + ::xo::db::Attribute create security_inherit_p \ + -pretty_name "Security Inherit" \ + -datatype boolean \ + -column_name security_inherit_p + ::xo::db::Attribute create package_id \ + -pretty_name "Package ID" \ + -datatype integer \ + -column_name package_id + ::xo::db::Attribute create creation_user \ + -pretty_name "Creation User" \ + -datatype integer \ + -column_name creation_user + ::xo::db::Attribute create creation_date \ + -pretty_name "Creation Date" \ + -datatype timestamp \ + -column_name creation_date + ::xo::db::Attribute create creation_ip \ + -pretty_name "Creation IP Address" \ + -column_name creation_ip + ::xo::db::Attribute create last_modified \ + -pretty_name "Last Modified On" \ + -datatype timestamp \ + -column_name last_modified + ::xo::db::Attribute create modifying_user \ + -pretty_name "Modifying User" \ + -datatype integer \ + -column_name modifying_user + ::xo::db::Attribute create modifying_ip \ + -pretty_name "Modifying IP Address" \ + -column_name modifying_ip } ::xo::db::Object db_slots ############## Index: openacs-4/packages/xotcl-core/tcl/cr-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/cr-procs.tcl,v diff -u -r1.76 -r1.76.2.1 --- openacs-4/packages/xotcl-core/tcl/cr-procs.tcl 30 Nov 2018 10:20:51 -0000 1.76 +++ openacs-4/packages/xotcl-core/tcl/cr-procs.tcl 5 Mar 2019 10:20:09 -0000 1.76.2.1 @@ -453,8 +453,9 @@ } lappend atts $fq } + foreach {slot_name slot} [array get :db_slot] { - switch -- $slot { + switch -glob -- $slot { ::xo::db::CrItem::slot::text { # # We need the rule, since insert the handling of the sql @@ -476,6 +477,9 @@ ::xo::db::CrItem::slot::name { lappend atts i.[$slot column_name] } + ::xo::db::Object::slot::* { + lappend atts o.[$slot column_name] + } default { lappend atts n.[$slot column_name] } @@ -954,9 +958,14 @@ foreach {__slot_name __slot} [[:info class] array get db_slot] { if { - $__slot eq "::xo::db::Object::slot::object_title" || - $__slot eq "::xo::db::CrItem::slot::name" || - $__slot eq "::xo::db::CrItem::slot::publish_date" + $__slot in { + "::xo::db::Object::slot::object_title" + "::xo::db::Object::slot::creation_user" + "::xo::db::Object::slot::creation_ip" + "::xo::db::Object::slot::package_id" + "::xo::db::CrItem::slot::name" + "::xo::db::CrItem::slot::publish_date" + } } continue set $__slot_name [set :$__slot_name] lappend __atts [$__slot column_name] @@ -1071,9 +1080,14 @@ foreach {__slot_name __slot} [$__class array get db_slot] { # :log "--slot = $__slot" if { - $__slot eq "::xo::db::Object::slot::object_title" || - $__slot eq "::xo::db::CrItem::slot::name" || - $__slot eq "::xo::db::CrItem::slot::publish_date" + $__slot in { + "::xo::db::Object::slot::object_title" + "::xo::db::Object::slot::creation_user" + "::xo::db::Object::slot::creation_ip" + "::xo::db::Object::slot::package_id" + "::xo::db::CrItem::slot::name" + "::xo::db::CrItem::slot::publish_date" + } } continue :instvar $__slot_name if {![info exists $__slot_name]} {set $__slot_name ""}