Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nikola Balog
erp5
Commits
b4acf377
Commit
b4acf377
authored
Jan 18, 2017
by
Ayush Tiwari
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bt5_prototype: Check for format file existence and then download bt or bp
parent
a3567803
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
4 deletions
+13
-4
product/ERP5/Tool/TemplateTool.py
product/ERP5/Tool/TemplateTool.py
+13
-4
No files found.
product/ERP5/Tool/TemplateTool.py
View file @
b4acf377
...
...
@@ -325,10 +325,10 @@ class TemplateTool (BaseTool):
REQUEST
.
RESPONSE
.
redirect
(
"%s?portal_status_message=%s"
%
(
ret_url
,
psm
))
def
_download_local
(
self
,
path
,
bt_id
,
is_package
=
False
):
def
_download_local
(
self
,
path
,
bt_id
,
format_version
):
"""Download Business Template from local directory or file
"""
if
is_package
:
if
format_version
==
2
:
bp
=
self
.
newContent
(
bt_id
,
'Business Package'
)
bp
.
importFile
(
path
)
return
bp
...
...
@@ -362,7 +362,7 @@ class TemplateTool (BaseTool):
shutil.rmtree(svn_checkout_tmp_dir)
security.declareProtected( '
Import
/
Export
objects
', '
download
' )
def download(self, url, id=None, REQUEST=None
, is_package=False
):
def download(self, url, id=None, REQUEST=None):
"""
Download Business Template from url, can be file or local directory
"""
...
...
@@ -386,8 +386,17 @@ class TemplateTool (BaseTool):
return self[self._setObject(id, bt)]
bt = self._download_url(url, id)
else:
# Check the format version for the bt
format_version_path = name+'
/
bt
/
template_version_format
'
try:
file = open(os.path.normpath(format_version_path))
format_version = int(file.read())
file.close()
except IOError:
format_version = 1
# XXX: Download only needed in case the file is in directory
bt = self._download_local(os.path.normpath(name), id,
is_package
)
bt = self._download_local(os.path.normpath(name), id,
format_version
)
bt.build(no_action=True)
return bt
...
...
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