IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-12-30 10:47:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix template path generation for Windows. Fixes #3139

Browse Source
This commit is contained in:
Murtuza Zabuawala 2018-03-13 07:55:37 -04:00 committed by Dave Page
parent 03b772bf64
commit 695d4e648c
1 changed files with 12 additions and 5 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,10 +11,13 @@ import os
def compile_template_name( def compile_template_name(
template_prefix, template_file_name, server_type, version): template_prefix, template_file_name, server_type, version):
return os.path.join(
compile_template_path(template_prefix, server_type, version), # Template path concatenation should be same as
template_file_name # 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
def compile_template_path(template_prefix, server_type, version): def compile_template_path(template_prefix, server_type, version):
@ -22,4 +25,8 @@ def compile_template_path(template_prefix, server_type, version):
version_path = '#{0}#{1}#'.format(server_type, version) version_path = '#{0}#{1}#'.format(server_type, version)
else: else:
version_path = '#{0}#'.format(version) version_path = '#{0}#'.format(version)
return os.path.join(template_prefix, version_path)
# 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