Index: openacs-4/packages/acs-templating/tcl/richtext-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-procs.tcl,v diff -u -N -r1.47 -r1.47.2.1 --- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl 8 May 2009 21:05:19 -0000 1.47 +++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl 15 May 2009 17:13:48 -0000 1.47.2.1 @@ -504,7 +504,7 @@ {relative_urls "false"} {height "450px" } {width "100%"} - {plugins "oacsimage,oacslink,style,layer,table,save,iespell,preview,zoom,media,searchreplace,print,contextmenu,paste,fullscreen,noneditable,visualchars,xhtmlxtras" } + {plugins "oacsimage,oacslink,style,layer,table,save,iespell,preview,media,searchreplace,print,contextmenu,paste,fullscreen,noneditable,visualchars,xhtmlxtras" } {browsers "msie,gecko,safari,opera" } {apply_source_formatting "true" } {paste_auto_cleanup_on_paste true} Index: openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl,v diff -u -N -r1.14 -r1.14.2.1 --- openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl 11 May 2009 15:21:43 -0000 1.14 +++ openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl 15 May 2009 17:13:48 -0000 1.14.2.1 @@ -22,7 +22,7 @@ # if user has write permission, create image upload form, -if {![info exists parent_id]} { +if {![info exists parent_id] || $parent_id eq ""} { set parent_id $user_id set write_p 1 } else { @@ -33,6 +33,19 @@ -privilege "write"] } +if {!$write_p} { + # if parent_id does not exist yet, let's use the pacakage_id + if { ![db_0or1row "check_parent" "select object_id from acs_objects where object_id=:parent_id"] } { + set parent_id $package_id + } + + # item might not exist! + set write_p [permission::permission_p \ + -party_id $user_id \ + -object_id $package_id \ + -privilege "write"] +} + if {$write_p} { # set recent files set recent_files_options [list] @@ -257,10 +270,10 @@ var param = window.dialogArguments; if (param) { - if ( typeof param['f_href'] != 'undefined' ) { - document.getElementById('f_href').value = param['f_href']; - document.getElementById('f_url').value = param['f_href']; - document.getElementById('f_title').value = param['f_title']; + if ( typeof param\['f_href'\] != 'undefined' ) { + document.getElementById('f_href').value = param\['f_href'\]; + document.getElementById('f_url').value = param\['f_href'\]; + document.getElementById('f_title').value = param\['f_title'\]; } } }; @@ -272,18 +285,18 @@ for (var i in required) { var el = document.getElementById(i); if (!el.value) { - alert(required[i]); + alert(required\[i\]); el.focus(); return false; } } // pass data back to the calling window - var fields = ['f_href','f_title', 'f_target']; + var fields = \['f_href','f_title', 'f_target'\]; var param = new Object(); for (var i in fields) { - var id = fields[i]; + var id = fields\[i\]; var el = document.getElementById(id); - param[id] = el.value; + param\[id\] = el.value; } __dlg_close(param); return false;