Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-invoices
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-invoices
Commits
f4164658
Commit
f4164658
authored
Jul 22, 2021
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Fixed issue on munich with installed ooffice
parent
33fce3c1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
8 deletions
+12
-8
view.tcl
www/view.tcl
+12
-8
No files found.
www/view.tcl
View file @
f4164658
...
...
@@ -87,6 +87,9 @@ set user_locale [lang::user::locale]
set
locale
$user
_locale
set
page_title
""
set
my_user
"undefined"
catch
{
set my_user
[
im_exec whoami
]
}
set
gen_vars
""
set
blurb
""
set
notify_vars
""
...
...
@@ -212,12 +215,11 @@ set timesheet_report_url [im_parameter -package_id [im_package_invoices_id] "Tim
# Check if ooffice is installed
set
err_msg
""
set
ooversion
""
set
status
[
util_memoize
[
list
catch
{
set
ooversion
[
im_exec ooffice --version
]}
err_msg
]
3600
]
if
{
$status
}
{
set pdf_enabled_p 0
}
else
{
set pdf_enabled_p 1
}
# ad_return_complaint 1 "status=$status, pdf_enabled_p=$pdf_enabled_p, ooversion=$ooversion, err_msg=$err_msg"
set
cmd
"export HOME=~
$my
_user; ooffice --version"
set
status
[
catch
{
set
ooversion
[
im_exec bash -l -c
$cmd
]}
err_msg
]
if
{
$status
}
{
set pdf_enabled_p 0
}
else
{
set pdf_enabled_p 1
}
# ad_return_complaint 1 "status=$status, pdf_enabled_p=$pdf_enabled_p, err_msg=<pre>$err_msg</pre>"
# Show CC ?
set
show_cost_center_p
[
im_parameter -package_id
[
im_package_invoices_id
]
"ShowCostCenterP"
""
0
]
...
...
@@ -1399,9 +1401,11 @@ if {"odt" eq $render_template_type} {
if {
$pdf
_p} {
set result ""
set err_msg ""
set cmd "
export HOME=~$my_user
;
ooffice --headless --convert-to pdf --outdir /tmp/
$odt
_zip
"
set status
[
catch
{
ns_log Notice
"intranet-invoice/view: im_exec
bash -l -c
\"
export HOME=~
\$\{
whoami
\}
; ooffice --headless --convert-to pdf --outdir /tmp/
$odt
_zip
\"
"
set result
[
im_exec bash -l -c
"export HOME=~
\$\{
whoami
\}
; ooffice --headless --convert-to pdf --outdir /tmp/
$odt
_zip"
]
ns_log Notice
"intranet-invoice/view: im_exec
$cmd
"
set result
[
im_exec bash -l -c
$cmd
]
}
err_msg
]
ns_log Notice "
intranet-invoice/view: result=$result
"
...
...
@@ -1413,7 +1417,7 @@ if {"odt" eq $render_template_type} {
if {!
[
file
readable
$odt
_pdf
]
} { set readable_msg "
File=$odt_pdf was not created.<br>Maybe you didn't install LibreOffice?
" }
if {0 !=
$status
|| "" ne
$readable
_msg} {
ad_return_complaint 1 "
<b>Error converting ODT to PDF</b>:<br><pre>$readable_msg<br>$err_msg</pre>
"
ad_return_complaint 1 "
<b>Error converting ODT to PDF</b>:<br><pre>$readable_msg<br>$err_msg</pre>
<br>executing: <pre>$cmd</pre>
"
ad_script_abort
}
}
...
...
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