Index: openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.tcl	27 Jun 2015 16:03:12 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.tcl	7 Aug 2017 23:47:58 -0000	1.5
@@ -12,14 +12,10 @@
     attribute_id:naturalnum,notnull
     attribute_enum_values:array,trim,optional
     { operation:trim "Finish adding values" }
-    { return_url "" }
+    { return_url:localurl "" }
 }
 
-set max_sort_order [db_string select_max_sort_order {
-    select nvl(max(v.sort_order),0)
-      from acs_enum_values v
-     where v.attribute_id = :attribute_id
-}]
+set max_sort_order [db_string select_max_sort_order {}]
 
 db_transaction {
     foreach ideal_sort_order [array names attribute_enum_values] {
@@ -42,16 +38,7 @@
 	    if { [db_resultrows] == 0 } {
 		# No update - insert the row. Set the enum_value to
 		# the pretty_name
-		db_dml insert_enum_value {
-		    insert into acs_enum_values v
-		    (attribute_id, sort_order, enum_value, pretty_name)
-		    select :attribute_id, :sort_order, :pretty_name, :pretty_name
-		    from dual
-		    where not exists (select 1 
-                                        from acs_enum_values v2
-                                       where v2.pretty_name = :pretty_name
-                                         and v2.attribute_id = :attribute_id)
-		}
+		db_dml insert_enum_value {}
 	    }
 	}
     }
@@ -67,3 +54,9 @@
 }
 
 ad_returnredirect $return_url
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: