Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-forum
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-forum
Commits
df239dde
Commit
df239dde
authored
Nov 19, 2015
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Fixed export_vars brace vs. brackets
parent
a2811f1b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
26 deletions
+26
-26
intranet-forum-common.sql
sql/common/intranet-forum-common.sql
+12
-12
intranet-forum-procs.tcl
tcl/intranet-forum-procs.tcl
+11
-11
new-2.tcl
www/new-2.tcl
+2
-2
new.adp
www/new.adp
+1
-1
No files found.
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',
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'
,
'"<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>"'
,
''
,
''
,
4
,
''
);
...
...
@@ -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
,
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
,
''
);
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',
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'
,
'"<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>"'
,
''
,
''
,
4
,
''
);
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'
,
'"<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
,
''
);
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
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'
,
'"<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>"'
,
''
,
''
,
4
,
''
);
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'
,
'"<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
,
''
);
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',
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'
,
'"<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>"'
,
''
,
''
,
4
,
''
);
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'
,
'"<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
,
''
);
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',
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'
,
'"<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>"'
,
''
,
''
,
4
,
''
);
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'
,
'"<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
,
''
);
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',
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'
,
'"<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>"'
,
''
,
''
,
4
,
''
);
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'
,
'"<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
,
''
);
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 {
<td>
[
im_gif -translate_p 1
$topic
_type_id
"
$topic
_type"
]
$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
}
{
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
"
...
...
@@ -637,7 +637,7 @@ ad_proc -public im_forum_render_tind {
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
"
...
...
@@ -1317,7 +1317,7 @@ ad_proc -public im_forum_component {
# Include a link to go to the next page
set next_start_idx
[
expr
$end
_idx + 1
]
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
\"
>>></a>"
}
else
{
set next_page_html
""
...
...
@@ -1524,7 +1524,7 @@ ad_proc -public im_forum_full_screen_component {
# 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
""
}
}
{
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 ""} } {
<table cellpadding=0 cellspacing=0 border=0 class='forumBar'>
<tr>
<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
</A>
</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"
]
</A>
</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"
]
</A>
</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"
]
</A>
</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"
]
</A>
</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"
]
</A>
</td>
...
...
www/new-2.tcl
View file @
df239dde
...
...
@@ -108,7 +108,7 @@ if {!$forum_folder_count} {
# Forward to create a new reply topic...
if
{[
string
equal
$actions
"reply"
]}
{
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
}
...
...
@@ -119,7 +119,7 @@ if {[string equal $actions "reply"]} {
# Forward to "new"
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
}
...
...
www/new.adp
View file @
df239dde
...
...
@@ -9,7 +9,7 @@
<form action=new-2 method=POST>
<%= [e
val "export_vars -form {[join $export_var_list " "]}"
] %>
<%= [e
xport_vars -form $export_var_list
] %>
<table cellspacing=1 border=0 cellpadding=1>
@table_body;noquote@
...
...
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