Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-confdb
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
project-open
intranet-confdb
Commits
3bf82736
Commit
3bf82736
authored
Sep 06, 2021
by
Project Open
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Fixed issue conflict with check_items_all conflict by renaming and
fixed issue with CSP not yet implemented
parent
7e32aef2
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
52 additions
and
9 deletions
+52
-9
related-objects-component.adp
lib/related-objects-component.adp
+1
-1
related-objects-component.tcl
lib/related-objects-component.tcl
+2
-2
intranet-confdb-create.sql
sql/postgresql/intranet-confdb-create.sql
+14
-5
upgrade-5.0.3.0.4-5.1.0.0.0.sql
sql/postgresql/upgrade/upgrade-5.0.3.0.4-5.1.0.0.0.sql
+26
-0
intranet-confdb-procs.tcl
tcl/intranet-confdb-procs.tcl
+1
-1
index.adp
www/index.adp
+8
-0
No files found.
lib/related-objects-component.adp
View file @
3bf82736
<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>
...
...
lib/related-objects-component.tcl
View file @
3bf82736
...
...
@@ -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
]
...
...
sql/postgresql/intranet-confdb-create.sql
View file @
3bf82736
...
...
@@ -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
,
''
);
...
...
sql/postgresql/upgrade/upgrade-5.0.3.0.4-5.1.0.0.0.sql
0 → 100644
View file @
3bf82736
-- 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
,
''
);
tcl/intranet-confdb-procs.tcl
View file @
3bf82736
...
...
@@ -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>
...
...
www/index.adp
View file @
3bf82736
...
...
@@ -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}] %>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment