Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -N -r1.180.2.11 -r1.180.2.12
--- openacs-4/packages/xowiki/xowiki.info 10 May 2019 16:05:20 -0000 1.180.2.11
+++ openacs-4/packages/xowiki/xowiki.info 21 May 2019 11:46:03 -0000 1.180.2.12
@@ -10,7 +10,7 @@
t
xowiki
-
+
Gustaf Neumann
A xotcl-based enterprise wiki system with multiple object types
2017-08-06
@@ -55,7 +55,7 @@
BSD-Style
2
-
+
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -N -r1.542.2.22 -r1.542.2.23
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 21 May 2019 08:07:39 -0000 1.542.2.22
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 21 May 2019 11:46:03 -0000 1.542.2.23
@@ -375,8 +375,11 @@
xi.package_id, xi.parent_id, xi.name,
$hkey_in_view xi.publish_status, xi.assignee, xi.state, xi.page_template, xi.item_id,
o.object_id, o.object_type, o.title AS object_title,
- (select context_id from acs_objects where object_id = xi.item_id) as context_id,
- o.security_inherit_p, o.creation_user, o.creation_date, o.creation_ip,
+ io.context_id,
+ io.creation_date,
+ io.creation_user,
+ io.creation_ip,
+ o.security_inherit_p,
o.last_modified, o.modifying_user, o.modifying_ip,
cr.revision_id, cr.title, content_revision__get_content(ci.live_revision) AS text,
cr.description, cr.publish_date, cr.mime_type, cr.nls_language,
@@ -387,7 +390,8 @@
xowiki_page.page_id,
xowiki_page.page_order,
xowiki_page.creator
- FROM xowiki_form_instance_item_index xi,
+ FROM xowiki_form_instance_item_index xi
+ inner join acs_objects io on object_id = xi.item_id,
lateral (select live_revision from cr_items where item_id = xi.item_id) ci
left join cr_revisions cr on (cr.revision_id = ci.live_revision)
left join acs_objects o on (o.object_id = ci.live_revision)
@@ -400,8 +404,11 @@
xi.package_id, xi.parent_id, xi.name,
$hkey_in_view xi.publish_status, xi.assignee, xi.state, xi.page_template, xi.item_id,
o.object_id, o.object_type, o.title AS object_title,
- (select context_id from acs_objects where object_id = xi.item_id) as context_id,
- o.security_inherit_p, o.creation_user, o.creation_date, o.creation_ip,
+ io.context_id,
+ io.creation_date,
+ io.creation_user,
+ io.creation_ip,
+ o.security_inherit_p,
o.last_modified, o.modifying_user, o.modifying_ip,
cr.revision_id, cr.title, content_revision__get_content(cr.revision_id) AS text,
cr.description, cr.publish_date, cr.mime_type, cr.nls_language,
@@ -413,6 +420,7 @@
xowiki_page.page_order,
xowiki_page.creator
FROM xowiki_form_instance_item_index xi
+ inner join acs_objects io on object_id = xi.item_id
left join cr_items ci on (ci.item_id = xi.item_id)
left join cr_revisions cr on (cr.revision_id = ci.live_revision)
left join acs_objects o on (o.object_id = ci.live_revision)
Index: openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl,v
diff -u -N -r1.15.2.5 -r1.15.2.6
--- openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl 10 May 2019 16:05:20 -0000 1.15.2.5
+++ openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl 21 May 2019 11:46:03 -0000 1.15.2.6
@@ -816,6 +816,17 @@
}
}
+ set v 5.10.0d32
+ if {[apm_version_names_compare $from_version_name $v] == -1 &&
+ [apm_version_names_compare $to_version_name $v] > -1} {
+ ns_log notice "-- upgrading to $v"
+
+ ns_log notice "dropping view xowiki_form_instance_item_view"
+ ::xo::dc dml drop {
+ drop view if exists xowiki_form_instance_item_view
+ }
+ }
+
}
}