IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix template path generation for Windows. Fixes #3139"

Browse Source 
This reverts commit 695d4e648c.

It's borked!
This commit is contained in:
Dave Page 2018-03-13 08:49:34 -04:00
parent 695d4e648c
commit 9365ab62fe
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
web/pgadmin/utils/compile_template_name.py
View File

@ -11,13 +11,10 @@ import os
def compile_template_name(
template_prefix, template_file_name, server_type, version):
# Template path concatenation should be same as
# Ref: ../pgadmin4/web/pgadmin/utils/versioned_template_loader.py +54
# to avoid path mismatch in windows
return compile_template_path(template_prefix, server_type, version) + \
'/' + template_file_name
return os.path.join(
compile_template_path(template_prefix, server_type, version),
template_file_name
)
def compile_template_path(template_prefix, server_type, version):
@ -25,8 +22,4 @@ def compile_template_path(template_prefix, server_type, version):
version_path = '#{0}#{1}#'.format(server_type, version)
else:
version_path = '#{0}#'.format(version)
# Template path concatenation should be same as
# Ref: ../pgadmin4/web/pgadmin/utils/versioned_template_loader.py +54
# to avoid path mismatch in windows
return template_prefix + '/' + version_path
return os.path.join(template_prefix, version_path)