Commit e2719908 authored by Frank Bergmann's avatar Frank Bergmann

- beautified & ordered fields by sort_order

parent 2d17838f
...@@ -51,12 +51,12 @@ ad_form \ ...@@ -51,12 +51,12 @@ ad_form \
-mode $form_mode \ -mode $form_mode \
-export {user_id return_url} \ -export {user_id return_url} \
-form { -form {
view_id:key(im_views_seq) view_id:key(im_views_seq)
{view_name:text(text) {label #intranet-core.View_Name#} } {view_name:text(text) {label #intranet-core.View_Name#} }
{view_type_id:text(im_category_tree),optional {label #intranet-core.View_Type#} {custom {category_type "Intranet DynView Type"}} {value ""} } {view_type_id:text(im_category_tree),optional {label #intranet-core.View_Type#} {custom {category_type "Intranet DynView Type"}} {value ""} }
{view_status_id:text(im_category_tree),optional {label #intranet-core.View_Status#} {custom {category_type "Intranet DynView Status"}} {value ""} } {view_status_id:text(im_category_tree),optional {label #intranet-core.View_Status#} {custom {category_type "Intranet DynView Status"}} {value ""} }
{sort_order:integer(text),optional {label #intranet-core.Sort_Order#} {html {size 10 maxlength 15}}} {sort_order:integer(text),optional {label #intranet-core.Sort_Order#} {html {size 10 maxlength 15}}}
{view_sql:text(textarea),optional {label #intranet-core.View_sql#} {html {cols 50 rows 5}}} {view_sql:text(textarea),optional {label #intranet-core.View_sql#} {html {cols 50 rows 5}}}
} }
...@@ -66,20 +66,20 @@ ad_form -extend -name view -on_request { ...@@ -66,20 +66,20 @@ ad_form -extend -name view -on_request {
} -select_query { } -select_query {
select v.view_id, select v.*
v.view_name,
v.view_type_id,
v.view_status_id,
v.sort_order,
v.view_sql
from im_views v from im_views v
where v.view_id = :view_id where v.view_id = :view_id
} -validate { } -validate {
{view_name {view_name
{![db_string unique_name_check "select count(*) from im_views {![db_string unique_name_check "
where view_name = :view_name and view_id != :view_id"]} select count(*)
from im_views
where
view_name = :view_name
and view_id != :view_id"]
}
"Duplicate View Name. Please use a new name." "Duplicate View Name. Please use a new name."
} }
...@@ -144,28 +144,22 @@ if { [exists_and_not_null view_id] } { ...@@ -144,28 +144,22 @@ if { [exists_and_not_null view_id] } {
display_template { display_template {
<a href="@columns.del_column_url@">#intranet-core.Delete#</a> <a href="@columns.del_column_url@">#intranet-core.Delete#</a>
} }
} }
} }
list::create \ list::create \
-name column_list \ -name column_list \
-multirow columns \ -multirow columns \
-key column_id \ -key column_id \
-actions $action_list \ -actions $action_list \
-elements $elements_list \ -elements $elements_list \
-filters { -filters { return_url }
return_url
}
db_multirow -extend {column_url del_column_url} columns get_columns { db_multirow -extend {column_url del_column_url} columns get_columns {
select vc.column_id, select vc.*
vc.column_name,
vc.group_id,
vc.sort_order
from im_view_columns vc from im_view_columns vc
where vc.view_id = :view_id where vc.view_id = :view_id
order by vc.column_name order by vc.sort_order
} { } {
set column_url [export_vars -base "new-column" {view_id column_id return_url}] set column_url [export_vars -base "new-column" {view_id column_id return_url}]
set del_column_url [export_vars -base "del-column" {view_id column_id return_url}] set del_column_url [export_vars -base "del-column" {view_id column_id return_url}]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment