Index: openacs-4/packages/xowiki-portlet/tcl/xowiki-admin-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki-portlet/tcl/xowiki-admin-portlet-procs.tcl,v diff -u -N -r1.4 -r1.4.2.1 --- openacs-4/packages/xowiki-portlet/tcl/xowiki-admin-portlet-procs.tcl 30 Apr 2018 09:14:23 -0000 1.4 +++ openacs-4/packages/xowiki-portlet/tcl/xowiki-admin-portlet-procs.tcl 8 Mar 2019 15:18:09 -0000 1.4.2.1 @@ -24,7 +24,7 @@ xowiki_admin_portlet proc pretty_name {} { return [parameter::get_from_package_key \ - -package_key [my package_key] \ + -package_key [:package_key] \ -parameter xowiki_admin_portlet_pretty_name] } @@ -44,7 +44,7 @@ } { return [portal::add_element_parameters \ -portal_id $portal_id \ - -portlet_name [my name] \ + -portlet_name [:name] \ -key package_id \ -value $package_id \ ] @@ -59,7 +59,7 @@ # This is easy since there's one and only one instace_id portal::remove_element \ -portal_id $portal_id \ - -portlet_name [my name] + -portlet_name [:name] } xowiki_admin_portlet ad_proc show { @@ -68,14 +68,14 @@ Display the xowiki admin PE } { portal::show_proc_helper \ - -package_key [my package_key] \ + -package_key [:package_key] \ -config_list $cf \ -template_src "xowiki-admin-portlet" } xowiki_admin_portlet proc install {} { - my log "--portlet calling [self proc]" - set name [my name] + :log "--portlet calling [self proc]" + set name [:name] db_transaction { # @@ -143,15 +143,15 @@ ::xo::db::sql::acs_sc_binding new \ -contract_name "portal_datasource" -impl_name $name } - my log "--portlet end of [self proc]" + :log "--portlet end of [self proc]" } xowiki_admin_portlet proc uninstall {} { - my log "--portlet calling [self proc]" + :log "--portlet calling [self proc]" # # completely identical to "xowiki_portlet uninstall" # - set name [my name] + set name [:name] db_transaction { # @@ -192,7 +192,7 @@ ::xo::db::sql::acs_sc_impl delete \ -impl_contract_name "portal_datasource" -impl_name $name } - my log "--portlet end of [self proc]" + :log "--portlet end of [self proc]" } Index: openacs-4/packages/xowiki-portlet/tcl/xowiki-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki-portlet/tcl/xowiki-portlet-procs.tcl,v diff -u -N -r1.3 -r1.3.6.1 --- openacs-4/packages/xowiki-portlet/tcl/xowiki-portlet-procs.tcl 24 Apr 2008 08:38:30 -0000 1.3 +++ openacs-4/packages/xowiki-portlet/tcl/xowiki-portlet-procs.tcl 8 Mar 2019 15:18:09 -0000 1.3.6.1 @@ -58,7 +58,7 @@ xowiki_portlet ad_proc show {cf} { } { portal::show_proc_helper \ - -package_key [my package_key] \ + -package_key [:package_key] \ -config_list $cf \ -template_src "xowiki-portlet" } @@ -67,8 +67,8 @@ # install # xowiki_portlet proc install {} { - my log "--portlet calling [self proc]" - set name [my name] + :log "--portlet calling [self proc]" + set name [:name] # # create the datasource # @@ -136,19 +136,19 @@ ::xo::db::sql::acs_sc_binding new \ -contract_name "portal_datasource" -impl_name $name } - my log "--portlet end of [self proc]" + :log "--portlet end of [self proc]" } # # uninstall # xowiki_portlet proc uninstall {} { - my log "--portlet calling [self proc]" + :log "--portlet calling [self proc]" # # completely identical to "xowiki_admin_portlet uninstall" # - set name [my name] + set name [:name] db_transaction { # @@ -190,7 +190,7 @@ ::xo::db::sql::acs_sc_impl delete \ -impl_contract_name "portal_datasource" -impl_name $name } - my log "--portlet end of [self proc]" + :log "--portlet end of [self proc]" } ::xowiki_portlet proc after-install {} { @@ -201,4 +201,4 @@ ::xowiki_portlet proc before-uninstall {} { ::xowiki_portlet uninstall ::xowiki_admin_portlet uninstall -} \ No newline at end of file +}