Commit 3bf82736 authored by Project Open's avatar Project Open

- Fixed issue conflict with check_items_all conflict by renaming and

  fixed issue with CSP not yet implemented
parent 7e32aef2
<script type="text/javascript" <if @::__csp_nonce@ not nil>nonce="@::__csp_nonce;literal@"</if>>
window.addEventListener('load', function() {
document.getElementById('list_check_all').addEventListener('click', function() { acs_ListCheckAll('conf_items_list', this.checked) });
document.getElementById('list_check_all_conf_related_objects').addEventListener('click', function() { acs_ListCheckAll('conf_items_related_list', this.checked) });
});
</script>
......
......@@ -39,7 +39,7 @@ list::create \
-actions $actions \
-elements {
ticket_chk {
label "<input type=\"checkbox\" id=list_check_all name=\"_dummy\" title=\"Check/uncheck all rows\">"
label "<input type=\"checkbox\" id=list_check_all_conf_related_objects name=\"_dummy\" title=\"Check/uncheck all rows\">"
display_template {
@tickets_multirow.ticket_chk;noquote@
}
......@@ -134,7 +134,7 @@ db_multirow -extend { ticket_chk object_url direction_pretty rel_name } tickets_
set ticket_chk "<input type=\"checkbox\"
name=\"rel_id\"
value=\"$rel_id\"
id=\"conf_items_list,$rel_id\">
id=\"conf_items_related_list,$rel_id\">
"
set rel_name [lang::message::lookup "" intranet-confdb.Rel_$rel_type $rel_type_pretty]
......
......@@ -806,10 +806,19 @@ delete from im_views where view_id = 940;
insert into im_views (view_id, view_name, visible_for) values (940, 'im_conf_item_list', 'view_conf_items');
-- insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
-- extra_select, extra_where, sort_order, visible_for) values (94001,940,NULL,
-- '<input id=list_check_all_conf_items type=checkbox name=_dummy>',
-- '$action_checkbox', '', '', 1, '');
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
extra_select, extra_where, sort_order, visible_for) values (94001,940,NULL,
'<input id=list_check_all type=checkbox name=_dummy>',
'$action_checkbox', '', '', 1, '');
extra_select, extra_where, sort_order, visible_for) values (94001,940,NULL,
'<input id=list_check_all_conf_items type=checkbox name=_dummy>',
'"<input type=checkbox name=conf_item_id.$conf_item_id id=conf_item,$conf_item_id>"',
'', '', 1, '');
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
extra_select, extra_where, sort_order, visible_for) values (94005, 940, NULL, 'Name',
......@@ -850,13 +859,13 @@ delete from im_views where view_id = 941;
--
insert into im_views (view_id, view_name, visible_for) values (941, 'im_conf_item_list_short', 'view_conf_items');
delete from im_view_columns where column_id = 94101;
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
extra_select, extra_where, sort_order, visible_for) values (94101,941,NULL,
'"<input id=list_check_all type=checkbox name=_dummy>"',
'"<input id=list_check_all_conf_items type=checkbox name=_dummy>"',
'"<input type=checkbox name=conf_item_id.$conf_item_id id=conf_item,$conf_item_id>"',
'', '', 1, '');
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
extra_select, extra_where, sort_order, visible_for) values (94105, 941, NULL, 'Name',
'"<nobr>$indent_short_html$gif_html<a href=$object_url>$conf_item_name</a></nobr>"','','',5,'');
......
-- upgrade-5.0.3.0.4-5.1.0.0.0.sql
SELECT acs_log__debug('/packages/intranet-confdb/sql/postgresql/upgrade/upgrade-5.0.3.0.4-5.1.0.0.0.sql','');
delete from im_view_columns where column_id = 94101;
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
extra_select, extra_where, sort_order, visible_for) values (94101,941,NULL,
'"<input id=list_check_all_conf_items type=checkbox name=_dummy>"',
'"<input type=checkbox name=conf_item_id.$conf_item_id id=conf_item,$conf_item_id>"',
'', '', 1, '');
delete from im_view_columns where column_id = 94001;
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
extra_select, extra_where, sort_order, visible_for) values (94001,940,NULL,
'<input id=list_check_all_conf_items type=checkbox name=_dummy>',
'"<input type=checkbox name=conf_item_id.$conf_item_id id=conf_item,$conf_item_id>"',
'', '', 1, '');
......@@ -1098,7 +1098,7 @@ ad_proc -public im_conf_item_list_component {
set component_html "
<script type=\"text/javascript\" nonce=\"[im_csp_nonce]\">
window.addEventListener('load', function() {
document.getElementById('list_check_all').addEventListener('click', function() { acs_ListCheckAll('conf_item', this.checked) });
document.getElementById('list_check_all_conf_items').addEventListener('click', function() { acs_ListCheckAll('conf_item', this.checked) });
});
</script>
......
......@@ -5,6 +5,14 @@
<property name="left_navbar">@left_navbar_html;literal@</property>
<property name="sub_navbar">@conf_item_navbar_html;literal@</property>
<script type="text/javascript" <if @::__csp_nonce@ not nil>nonce="@::__csp_nonce;literal@"</if>>
window.addEventListener('load', function() {
document.getElementById('list_check_all_conf_items').addEventListener('click', function() { acs_ListCheckAll('conf_item', this.checked) });
});
</script>
<table cellspacing="0" cellpadding="0" border="0" width="100%">
<form action=/intranet-confdb/action method=POST>
<%= [export_vars -form {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