Index: openacs-4/packages/attachments/www/detach.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/detach.tcl,v
diff -u -N -r1.7 -r1.7.2.1
--- openacs-4/packages/attachments/www/detach.tcl	7 Apr 2018 18:07:50 -0000	1.7
+++ openacs-4/packages/attachments/www/detach.tcl	12 Jul 2019 14:31:10 -0000	1.7.2.1
@@ -1,9 +1,9 @@
 # packages/attachments/www/detach.tcl
 
 ad_page_contract {
-    
+
     detaches an attached item from an object
-    
+
     @author Deds Castillo (deds@i-manila.com.ph)
     @creation-date 2006-07-13
     @cvs-id $Id$
@@ -17,70 +17,87 @@
 }
 
 set user_id [auth::require_login]
-
-# require write
+#
+# Require write permission on the object to remove its attachments
+#
 permission::require_permission -object_id $object_id -privilege write
-
-set object_name [acs_object_name $object_id]
-set attachment_name [acs_object_name $attachment_id]
-
-set title "[_ attachments.Detach_file_from]"
-set context "[_ attachments.Detach]"
-
-ad_form \
-    -name detach \
-    -export { object_id attachment_id return_url } \
-    -cancel_url $return_url \
-    -form {
-	{inform:text(inform) {label {}} {value "[_ attachments.Are_you_sure_detach]"}}
-	{attachment_name:text(inform) {label "[_ attachments.Attachment]"}}
-	{object_name:text(inform) {label "[_ attachments.on_Object]"}}
-    }
-
-set attached_to_other_objects_n [db_string get_other_object_count {
-    select count(*)
-    from attachments
-    where item_id = :attachment_id
-          and object_id <> :object_id
+#
+# Message keys
+#
+set object_name     [acs_object_name $object_id]
+set attachment_name [attachments::get_title -attachment_id $attachment_id]
+set title           "[_ attachments.Detach_file_from]"
+set context         "[_ attachments.Detach]"
+#
+# Is the attachment attached to other objects?
+#
+set attached_to_other_objects_p [db_string attached_to_others {
+    select case when exists (
+         select *
+           from attachments
+          where item_id = :attachment_id
+            and object_id <> :object_id
+    ) then 1 else 0 end;
 }]
-
-set delete_options [list [list [_ acs-kernel.common_No] 0] [list [_ acs-kernel.common_Yes] 1]]
-
-if {$attached_to_other_objects_n} {
-    ad_form \
-	-extend \
-	-name detach \
-	-form {
-	    {count_info:text(inform) {label {}} {value "[_ attachments.Only_detach]"}}
-	    {detach:text(submit) {label "[_ attachments.Detach]"}}
-	}
+#
+# Is the attachment inside the file storage?
+#
+set is_in_file_storage_p [db_string is_in_fs_files {
+    select case when exists (
+         select *
+           from fs_files
+          where file_id = :attachment_id
+    ) then 1 else 0 end;
+}]
+#
+# Define form elements
+#
+set form_elements {
+    {inform:text(inform) {label {}} {value "[_ attachments.Are_you_sure_detach]"}}
+    {attachment_name:text(inform) {label "[_ attachments.Attachment]"}}
+    {object_name:text(inform) {label "[_ attachments.on_Object]"}}
+}
+if {$is_in_file_storage_p} {
+    if {$attached_to_other_objects_p} {
+        append form_elements {
+            {count_info:text(inform) {label {}} {value "[_ attachments.Only_detach]"}}
+            {detach:text(submit) {label "[_ attachments.Detach]"}}
+        }
+    } else {
+        append form_elements {
+            {count_info:text(inform) {label {}} {value "[_ attachments.Can_delete]"}}
+            {detach:text(submit) {label "[_ attachments.Detach]"}}
+            {delete_button:text(submit) {label "[_ attachments.delete_from_fs]"}}
+        }
+    }
 } else {
-    ad_form \
-	-extend \
-	-name detach \
-	-form {
-	    {count_info:text(inform) {label {}} {value "[_ attachments.Can_delete]"}}
-	    {detach_button:text(submit) {label "[_ attachments.Detach]"}}
-	    {delete_button:text(submit) {label "[_ attachments.delete_from_fs]"}}
-	}
+    append form_elements {
+        {detach:text(submit) {label "[_ attachments.Detach]"}}
+    }
 }
-
+#
+# Declare form
+#
 ad_form \
-    -extend \
     -name detach \
-    -form {
-    } -on_request {
-    } -on_submit {
-	attachments::unattach -object_id $object_id -attachment_id $attachment_id
-	if {[info exists delete_button] && $delete_button ne ""
-	    && !$attached_to_other_objects_n
-	} {
-	    fs::delete_file -item_id $attachment_id		
-	}
+    -export { object_id attachment_id return_url } \
+    -form $form_elements \
+    -cancel_url $return_url \
+    -on_request {} \
+    -on_submit {
+        attachments::unattach -object_id $object_id -attachment_id $attachment_id
+        if {[info exists delete_button]
+            && $delete_button ne ""
+            && !$attached_to_other_objects_p
+            && $is_in_file_storage_p
+        } {
+           fs::delete_file -item_id $attachment_id
+        }
     } -after_submit {
-	ad_returnredirect $return_url
+        ad_returnredirect $return_url
         ad_script_abort
     }
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4