ScoDoc/ScoDoc
ScoDoc
/
ScoDoc
8
2
Fork 15
Code Issues 145 Pull Requests Projects 3 Releases 107 Wiki Activity

logos+images_refactoring #179

Closed
jmplace wants to merge 9 commits from jmplace:logos+images_refactoring into master
pull from: jmplace:logos+images_refactoring
merge into: ScoDoc:master
Conversation 0 Commits 9 Files Changed 8 +5 -4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ee4cebb5bb - Show all commits

9
app/pe/pe_tools.py
View File

@ -44,6 +44,7 @@ import unicodedata
import app.scodoc.sco_utils as scu
from app import log
from app.scodoc.sco_logos import find_logo
PE_DEBUG = 0
@ -202,10 +203,10 @@ def add_pe_stuff_to_zip(zipfile, ziproot):
# Logos: (add to logos/ directory in zip)
logos_names = ["logo_header.jpg", "logo_footer.jpg"]
for f in logos_names:
logo = os.path.join(scu.SCODOC_LOGOS_DIR, f)
if os.path.isfile(logo):
add_local_file_to_zip(zipfile, ziproot, logo, "avis/logos/" + f)
for name in logos_names:
logo = find_logo(logoname=name, dept_id=g.scodoc_dept)
if logo is not None:
add_local_file_to_zip(zipfile, ziproot, logo, "avis/logos/" + logo.filename)
# ----------------------------------------------------------------------------------------