Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v diff -u -r1.114 -r1.115 --- openacs-4/packages/new-portal/tcl/portal-procs.tcl 18 Feb 2002 20:53:42 -0000 1.114 +++ openacs-4/packages/new-portal/tcl/portal-procs.tcl 18 Feb 2002 21:21:06 -0000 1.115 @@ -1082,6 +1082,10 @@ set config(user_editable_p) "f" } + # HACK FIXME (ben) + # setting editable to false + set config(user_editable_p) "f" + # do the callback for the ::show proc # evaulate the datasource. if { [catch { set element(content) \ @@ -1092,9 +1096,15 @@ ad_return_complaint 1 "*** portal::render_element show callback Error! ***

$errmsg\n\n" } - set element(name) \ - [datasource_call \ - $element(datasource_id) "GetPrettyName" [list]] + # We use the actual pretty name from the DB (ben) + # FIXME: this is not as good as it should be + if {$element(ds_name) == $element(pretty_name)} { + set element(name) \ + [datasource_call \ + $element(datasource_id) "GetPrettyName" [list]] + } else { + set element(name) $element(pretty_name) + } set element(link) \ [datasource_call $element(datasource_id) "Link" [list]] Index: openacs-4/packages/new-portal/tcl/portal-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.xql,v diff -u -r1.17 -r1.18 --- openacs-4/packages/new-portal/tcl/portal-procs.xql 18 Feb 2002 19:54:52 -0000 1.17 +++ openacs-4/packages/new-portal/tcl/portal-procs.xql 18 Feb 2002 21:21:06 -0000 1.18 @@ -425,10 +425,13 @@ pem.datasource_id, pem.state, pet.filename as filename, - pet.resource_dir as resource_dir - from portal_element_map pem, portal_element_themes pet + pet.resource_dir as resource_dir, + pem.pretty_name as pretty_name, + pd.name as ds_name + from portal_element_map pem, portal_element_themes pet, portal_datasources pd where pet.theme_id = :theme_id and pem.element_id = :element_id + and pem.datasource_id = pd.datasource_id