Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-search-pg
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-search-pg
Commits
1d9d3e3b
Commit
1d9d3e3b
authored
Feb 09, 2017
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Fixed search for ]po[ minimal configuration
parent
439253ad
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
9 deletions
+17
-9
search.tcl
www/search.tcl
+17
-9
No files found.
www/search.tcl
View file @
1d9d3e3b
...
...
@@ -222,7 +222,7 @@ db_foreach object_type $sql {
}
regsub -all
{
}
$object
_type_pretty_name
{
_
}
object_type_pretty_name_sub
if
{
"im_invoice"
==$object_type
}
{
if
{
"im_invoice"
eq
$object
_type
}
{
set object_type_pretty_name
[
lang::message::lookup
""
intranet-cost.FinancialDocument
"Financial Document"
]
}
else
{
set object_type_pretty_name
[
lang::message::lookup
""
intranet-core.$object_type_pretty_name_sub
$object
_type_pretty_name
]
...
...
@@ -500,6 +500,21 @@ if {[im_table_exists im_events]} {
"
}
set
invoice_union
""
if
{[
im_table_exists im_invoices
]}
{
set invoice_union
"
UNION
select invoice_id as object_id,
'im_invoice' as object_type,
c.cost_type_id as object_sub_type_id
from im_invoices i,
im_costs c
where i.invoice_id = c.cost_id
$invoice
_perm_sql
"
}
set
sql
"
select
acs_object__name(so.object_id) as name,
...
...
@@ -536,14 +551,7 @@ set sql "
from im_companies c
where 1=1
$company
_perm_sql
UNION
select invoice_id as object_id,
'im_invoice' as object_type,
c.cost_type_id as object_sub_type_id
from im_invoices i,
im_costs c
where i.invoice_id = c.cost_id
$invoice
_perm_sql
$invoice
_union
UNION
select person_id as object_id,
'user' as object_type,
...
...
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