Skip to content

I
intranet-forum
Commit df239dde authored by Frank Bergmann's avatar Frank Bergmann
Browse files
Options

- Fixed export_vars brace vs. brackets

parent a2811f1b
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 26 deletions
sql/common/intranet-forum-common.sql
View file @ df239dde
...@@ -136,7 +136,7 @@ extra_select, extra_where, sort_order, visible_for) values (4000,40,NULL,'P', ...@@ -136,7 +136,7 @@ extra_select, extra_where, sort_order, visible_for) values (4000,40,NULL,'P',
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl, 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 (4002,40,NULL,'Type', extra_select, extra_where, sort_order, visible_for) values (4002,40,NULL,'Type',
'"<a href=/intranet-forum/view?[export_url_vars topic_id return_url]>\ '"<a href=/intranet-forum/view?[export_vars -url {topic_id return_url}]>\
[im_gif $topic_type]</a>"', [im_gif $topic_type]</a>"',
'','',4,''); '','',4,'');
...@@ -147,7 +147,7 @@ extra_select, extra_where, sort_order, visible_for) values (4003,40,NULL,'Object ...@@ -147,7 +147,7 @@ extra_select, extra_where, sort_order, visible_for) values (4003,40,NULL,'Object
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl, 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 (4004,40,NULL,'Subject', extra_select, extra_where, sort_order, visible_for) values (4004,40,NULL,'Subject',
'"<a href=/intranet-forum/view?[export_url_vars topic_id return_url]>\ '"<a href=/intranet-forum/view?[export_vars -url {topic_id return_url}]>\
[string_truncate -len 80 $subject]</a>"','','',6,''); [string_truncate -len 80 $subject]</a>"','','',6,'');
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl, insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
...@@ -177,13 +177,13 @@ extra_select, extra_where, sort_order, visible_for) values (4100,41,NULL,'P', ...@@ -177,13 +177,13 @@ extra_select, extra_where, sort_order, visible_for) values (4100,41,NULL,'P',
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl, 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 (4102,41,NULL,'Type', extra_select, extra_where, sort_order, visible_for) values (4102,41,NULL,'Type',
'"<a href=/intranet-forum/view?[export_url_vars topic_id return_url]>\ '"<a href=/intranet-forum/view?[export_vars -url {topic_id return_url}]>\
[im_gif $topic_type]</a>"', [im_gif $topic_type]</a>"',
'','',4,''); '','',4,'');
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl, 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 (4104,41,NULL,'Subject', extra_select, extra_where, sort_order, visible_for) values (4104,41,NULL,'Subject',
'"<a href=/intranet-forum/view?[export_url_vars topic_id return_url]>\ '"<a href=/intranet-forum/view?[export_vars -url {topic_id return_url}]>\
[string_truncate -len 80 $subject]</a>"','','',6,''); [string_truncate -len 80 $subject]</a>"','','',6,'');
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl, insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
...@@ -232,13 +232,13 @@ extra_select, extra_where, sort_order, visible_for) values (4201,42,NULL,'Object ...@@ -232,13 +232,13 @@ extra_select, extra_where, sort_order, visible_for) values (4201,42,NULL,'Object
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl, 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 (4202,42,NULL,'Type', extra_select, extra_where, sort_order, visible_for) values (4202,42,NULL,'Type',
'"<a href=/intranet-forum/view?[export_url_vars topic_id return_url]>\ '"<a href=/intranet-forum/view?[export_vars -url {topic_id return_url}]>\
[im_gif $topic_type]</a>"', [im_gif $topic_type]</a>"',
'','',4,''); '','',4,'');
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl, 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 (4204,42,NULL,'Subject', extra_select, extra_where, sort_order, visible_for) values (4204,42,NULL,'Subject',
'"<a href=/intranet-forum/view?[export_url_vars topic_id return_url]>\ '"<a href=/intranet-forum/view?[export_vars -url {topic_id return_url}]>\
[string_truncate -len 80 $subject]</A>"','','',6,''); [string_truncate -len 80 $subject]</A>"','','',6,'');
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl, insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
...@@ -290,13 +290,13 @@ extra_select, extra_where, sort_order, visible_for) values (4400,44,NULL,'P', ...@@ -290,13 +290,13 @@ extra_select, extra_where, sort_order, visible_for) values (4400,44,NULL,'P',
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl, 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 (4402,44,NULL,'Type', extra_select, extra_where, sort_order, visible_for) values (4402,44,NULL,'Type',
'"<a href=/intranet-forum/view?[export_url_vars topic_id return_url]>\ '"<a href=/intranet-forum/view?[export_vars -url {topic_id return_url}]>\
[im_gif $topic_type]</a>"', [im_gif $topic_type]</a>"',
'','',4,''); '','',4,'');
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl, 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 (4404,44,NULL,'Subject', extra_select, extra_where, sort_order, visible_for) values (4404,44,NULL,'Subject',
'"<a href=/intranet-forum/view?[export_url_vars topic_id return_url]>\ '"<a href=/intranet-forum/view?[export_vars -url {topic_id return_url}]>\
[string_truncate -len 80 $subject]</a>"','','',6,''); [string_truncate -len 80 $subject]</a>"','','',6,'');
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl, insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
...@@ -335,13 +335,13 @@ extra_select, extra_where, sort_order, visible_for) values (4500,45,NULL,'P', ...@@ -335,13 +335,13 @@ extra_select, extra_where, sort_order, visible_for) values (4500,45,NULL,'P',
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl, 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 (4502,45,NULL,'Type', extra_select, extra_where, sort_order, visible_for) values (4502,45,NULL,'Type',
'"<a href=/intranet-forum/view?[export_url_vars topic_id return_url]>\ '"<a href=/intranet-forum/view?[export_vars -url { topic_id return_url}]>\
[im_gif $topic_type]</a>"', [im_gif $topic_type]</a>"',
'','',4,''); '','',4,'');
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl, 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 (4504,45,NULL,'Subject', extra_select, extra_where, sort_order, visible_for) values (4504,45,NULL,'Subject',
'"<a href=/intranet-forum/view?[export_url_vars topic_id return_url]>\ '"<a href=/intranet-forum/view?[export_vars -url { topic_id return_url}]>\
[string_truncate -len 80 $subject]</a>"','','',6,''); [string_truncate -len 80 $subject]</a>"','','',6,'');
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl, insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
...@@ -380,13 +380,13 @@ extra_select, extra_where, sort_order, visible_for) values (4600,46,NULL,'P', ...@@ -380,13 +380,13 @@ extra_select, extra_where, sort_order, visible_for) values (4600,46,NULL,'P',
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl, 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 (4602,46,NULL,'Type', extra_select, extra_where, sort_order, visible_for) values (4602,46,NULL,'Type',
'"<a href=/intranet-forum/view?[export_url_vars topic_id return_url]>\ '"<a href=/intranet-forum/view?[export_vars -url { topic_id return_url}]>\
[im_gif $topic_type]</a>"', [im_gif $topic_type]</a>"',
'','',4,''); '','',4,'');
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl, 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 (4604,46,NULL,'Subject', extra_select, extra_where, sort_order, visible_for) values (4604,46,NULL,'Subject',
'"<a href=/intranet-forum/view?[export_url_vars topic_id return_url]>\ '"<a href=/intranet-forum/view?[export_vars -url { topic_id return_url}]>\
[string_truncate -len 80 $subject]</a>"','','',6,''); [string_truncate -len 80 $subject]</a>"','','',6,'');
insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl, insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
......
tcl/intranet-forum-procs.tcl
View file @ df239dde
...@@ -546,10 +546,10 @@ ad_proc -public im_forum_render_tind { ...@@ -546,10 +546,10 @@ ad_proc -public im_forum_render_tind {
<td> <td>
[im_gif -translate_p 1 $topic_type_id "$topic_type"] [im_gif -translate_p 1 $topic_type_id "$topic_type"]
$subject" $subject"
append tind_html " (<A href=/intranet-forum/new?parent_id=$topic_id&[export_url_vars return_url]>[_ intranet-forum.Reply]</A>)" append tind_html " (<A href=/intranet-forum/new?parent_id=$topic_id&[export_vars -url {return_url}]>[_ intranet-forum.Reply]</A>)"
if {$object_admin || $user_id==$owner_id} { if {$object_admin || $user_id==$owner_id} {
append tind_html " (<A href=/intranet-forum/new?[export_url_vars topic_id return_url]>[_ intranet-forum.Edit]</A>)" append tind_html " (<A href=/intranet-forum/new?[export_vars -url {topic_id return_url}]>[_ intranet-forum.Edit]</A>)"
} }
append tind_html " append tind_html "
...@@ -637,7 +637,7 @@ ad_proc -public im_forum_render_tind { ...@@ -637,7 +637,7 @@ ad_proc -public im_forum_render_tind {
if {$object_admin || $user_id==$owner_id} { if {$object_admin || $user_id==$owner_id} {
# append tind_html " (<A href=/intranet-forum/assign?[export_url_vars topic_id return_url]>[_ intranet-forum.Assign]</A>)" # append tind_html " (<A href=/intranet-forum/assign?[export_vars -url {topic_id return_url}]>[_ intranet-forum.Assign]</A>)"
} }
append tind_html " append tind_html "
...@@ -1317,7 +1317,7 @@ ad_proc -public im_forum_component { ...@@ -1317,7 +1317,7 @@ ad_proc -public im_forum_component {
# Include a link to go to the next page # Include a link to go to the next page
set next_start_idx [expr $end_idx + 1] set next_start_idx [expr $end_idx + 1]
set forum_max_entries_per_page $max_entries_per_page set forum_max_entries_per_page $max_entries_per_page
set next_page_url "$current_page_url?[export_url_vars forum_object_id forum_max_entries_per_page forum_order_by]&forum_start_idx=$next_start_idx&$pass_through_vars_html" set next_page_url "$current_page_url?[export_vars -url {forum_object_id forum_max_entries_per_page forum_order_by}]&forum_start_idx=$next_start_idx&$pass_through_vars_html"
set next_page_html "($remaining_items more) <A href=\"$next_page_url\">&gt;&gt;</a>" set next_page_html "($remaining_items more) <A href=\"$next_page_url\">&gt;&gt;</a>"
} else { } else {
set next_page_html "" set next_page_html ""
...@@ -1524,7 +1524,7 @@ ad_proc -public im_forum_full_screen_component { ...@@ -1524,7 +1524,7 @@ ad_proc -public im_forum_full_screen_component {
# Forum Navigation Bar # Forum Navigation Bar
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# <A HREF=/intranet-forum/index?[export_url_vars object_id return_url]> # <A HREF=/intranet-forum/index?[export_vars -url {object_id return_url}]>
ad_proc -public im_forum_create_bar { title_text object_id {return_url ""} } { ad_proc -public im_forum_create_bar { title_text object_id {return_url ""} } {
Returns rendered HTML table with icons for creating new Returns rendered HTML table with icons for creating new
...@@ -1534,32 +1534,32 @@ ad_proc -public im_forum_create_bar { title_text object_id {return_url ""} } { ...@@ -1534,32 +1534,32 @@ ad_proc -public im_forum_create_bar { title_text object_id {return_url ""} } {
<table cellpadding=0 cellspacing=0 border=0 class='forumBar'> <table cellpadding=0 cellspacing=0 border=0 class='forumBar'>
<tr> <tr>
<td> <td>
<A HREF=/intranet-forum/index?[export_url_vars object_id return_url]> <A HREF=/intranet-forum/index?[export_vars -url {object_id return_url}]>
$title_text $title_text
</A> </A>
</td> </td>
<td> <td>
<A href='/intranet-forum/new?topic_type_id=1102&[export_url_vars object_id return_url]'> <A href='/intranet-forum/new?topic_type_id=1102&[export_vars -url {object_id return_url}]'>
[im_gif -translate_p 1 "incident_add" "Create new Incident"] [im_gif -translate_p 1 "incident_add" "Create new Incident"]
</A> </A>
</td> </td>
<td> <td>
<A href='/intranet-forum/new?topic_type_id=1104&[export_url_vars object_id return_url]'> <A href='/intranet-forum/new?topic_type_id=1104&[export_vars -url {object_id return_url}]'>
[im_gif -translate_p 1 "task_add" "Create new Task"] [im_gif -translate_p 1 "task_add" "Create new Task"]
</A> </A>
</td> </td>
<td> <td>
<A href='/intranet-forum/new?topic_type_id=1106&[export_url_vars object_id return_url]'> <A href='/intranet-forum/new?topic_type_id=1106&[export_vars -url {object_id return_url}]'>
[im_gif -translate_p 1 "discussion_add" "Create a new Discussion"] [im_gif -translate_p 1 "discussion_add" "Create a new Discussion"]
</A> </A>
</td> </td>
<td> <td>
<A href='/intranet-forum/new?topic_type_id=1100&[export_url_vars object_id return_url]'> <A href='/intranet-forum/new?topic_type_id=1100&[export_vars -url {object_id return_url}]'>
[im_gif -translate_p 1 "news_add" "Create new News Item"] [im_gif -translate_p 1 "news_add" "Create new News Item"]
</A> </A>
</td> </td>
<td> <td>
<A href='/intranet-forum/new?topic_type_id=1108&[export_url_vars object_id return_url]'> <A href='/intranet-forum/new?topic_type_id=1108&[export_vars -url {object_id return_url}]'>
[im_gif -translate_p 1 "note_add" "Create new Note"] [im_gif -translate_p 1 "note_add" "Create new Note"]
</A> </A>
</td> </td>
......
www/new-2.tcl
View file @ df239dde
...@@ -108,7 +108,7 @@ if {!$forum_folder_count} { ...@@ -108,7 +108,7 @@ if {!$forum_folder_count} {
# Forward to create a new reply topic... # Forward to create a new reply topic...
if {[string equal $actions "reply"]} { if {[string equal $actions "reply"]} {
set parent_id $topic_id set parent_id $topic_id
ad_returnredirect "/intranet-forum/new?[export_url_vars parent_id return_url]" ad_returnredirect "/intranet-forum/new?[export_vars -url {parent_id return_url}]"
return return
} }
...@@ -119,7 +119,7 @@ if {[string equal $actions "reply"]} { ...@@ -119,7 +119,7 @@ if {[string equal $actions "reply"]} {
# Forward to "new" # Forward to "new"
if {[string equal $actions "edit"]} { if {[string equal $actions "edit"]} {
ad_returnredirect "/intranet-forum/new?&[export_url_vars topic_id return_url]" ad_returnredirect "/intranet-forum/new?&[export_vars -url {topic_id return_url}]"
return return
} }
......
www/new.adp
View file @ df239dde
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<form action=new-2 method=POST> <form action=new-2 method=POST>
<%= [eval "export_vars -form {[join $export_var_list " "]}"] %> <%= [export_vars -form $export_var_list] %>
<table cellspacing=1 border=0 cellpadding=1> <table cellspacing=1 border=0 cellpadding=1>
@table_body;noquote@ @table_body;noquote@
......
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