fixpt2

.gitignore

@@ -1,4 +1,6 @@
 __pycache__
 config*
 .DS_Store
-*.pyc
+*.pyc
+backstage/upload
+!backstage/upload/routes.py

backstage/collections/routes.py

@@ -44,6 +44,8 @@ def create():
     form = CollectionCreateForm()
     csliderimg = []
     csliderimgfilename = []
+    ownerimgfile = ""
+    commentimgfile = ""
     form.image.data.filename = processImgFile(form.image.data.filename)
     # for file in form.collectionslider.data:
     #     file.filename = processImgFile(file.filename)
@@ -54,8 +56,13 @@ def create():
 
     form.image.data.filename = str(uuid.uuid4()).replace('-','') + ".webp"
     form.coverimg.data.filename = str(uuid.uuid4()).replace('-','') + ".webp"
-    form.ownerimg.data.filename = str(uuid.uuid4()).replace('-','') + ".webp"
-    form.comment.data.filename = str(uuid.uuid4()).replace('-','') + ".webp"
+    print(form.ownerimg.data)
+    if form.ownerimg.data:
+        form.ownerimg.data.filename = str(uuid.uuid4()).replace('-','') + ".webp"
+        ownerimgfile = "img/" + form.ownerimg.data.filename
+    if form.comment.data:
+        form.comment.data.filename = str(uuid.uuid4()).replace('-','') + ".webp"
+        commentimgfile = "img/" + form.comment.data.filename
 
     front_matter = '''---
 meta_title: "{}"\nmeta_description: "{}"\ntitle: "{}"\ndate: {}\n\
@@ -69,7 +76,7 @@ description: "{}"\n\
 tags: ["{}"]\n\
 banner_img_text: "{}"\n\
 homeowner: "{}"\n\
-owner_img: "img/{}"\n\
+owner_img: "{}"\n\
 size: "{}"\n\
 house_size: "{}"\n\
 bed_num: "{}"\n\
@@ -83,13 +90,13 @@ budget: "{}"\n\
 construction: "{}"\n\
 collection_description: "{}"\n\
 collection_slider: [] \n\
-comment: "img/{}"\n\
+comment: "{}"\n\
 ---'''.format(form.title.data, form.description.data.replace('\r\n','<br>'), form.title.data,
               get_now_time(), 'true', 'collection', '/collection/{}'.format(eng_name),
               form.image.data.filename, form.collectiontitle.data, form.coverimg.data.filename, form.description.data.replace('\r\n','<br>'), form.tags.data,
-              form.bannerimgtext.data, form.homeowner.data, form.ownerimg.data.filename, form.size.data, form.housesize.data, form.bednum.data,
+              form.bannerimgtext.data, form.homeowner.data, ownerimgfile, form.size.data, form.housesize.data, form.bednum.data,
               form.roomcount.data, form.housetype.data, form.designer.data, form.space.data, form.loc.data, form.budgetr.data,
-              form.budget.data, form.construction.data, form.collectiondesc.data.replace('\r\n','<br>'), form.comment.data.filename)
+              form.budget.data, form.construction.data, form.collectiondesc.data.replace('\r\n','<br>'), commentimgfile)
     print(front_matter)
     data = {'frontMatter': front_matter,
             'name': eng_name,

backstage/templates/collections.html

@@ -40,14 +40,14 @@
     {{ form.title(class="form-control form-control-lg") }}
 
     {{ form.description.label(class="form-control-label modal__label mt-3 mb-1") }} <span class="text-danger">(建議字數:
-      50字內)</span>
+      30字內)</span>
     {{ form.description(class="form-control form-control-lg textarea") }}
 
     {{ form.collectiontitle.label(class="form-control-label modal__label mb-1") }}
     {{ form.collectiontitle(class="form-control form-control-lg") }}
 
     {{ form.collectiondesc.label(class="form-control-label modal__label mt-3 mb-1") }} <span class="text-danger">(建議字數:
-      50字內)</span>
+      133字內)</span>
     {{ form.collectiondesc(class="form-control form-control-lg textarea") }}
 
     {{ form.image.label(class="form-control-label modal__label mt-3 mb-1") }} <span class="text-danger">(建議尺寸/比例:
@@ -67,7 +67,7 @@
     {{ form.homeowner.label(class="form-control-label modal__label mt-3 mb-1") }}
     {{ form.homeowner(class="form-control form-control-lg") }}
 
-    {{ form.ownerimg.label(class="form-control-label modal__label mt-3 mb-1") }}
+    {{ form.ownerimg.label(class="form-control-label modal__label mt-3 mb-1") }} <span class="text-danger">(若無屋主照片則免填)</span>
     {{ form.ownerimg(class="form-control form-control-lg") }}
 
     {{ form.size.label(class="form-control-label modal__label mt-3 mb-1") }}
@@ -103,8 +103,10 @@
     {{ form.construction.label(class="form-control-label modal__label mt-3 mb-1") }}
     {{ form.construction(class="form-control form-control-lg") }}
 
+    <span class="d-none">
     {{ form.comment.label(class="form-control-label modal__label mt-3 mb-1") }}
     {{ form.comment(class="form-control form-control-lg modal__file") }}
+  </span>
 
   </div>
   <div class="modal-footer  pb-0 border-0">
@@ -347,7 +349,7 @@
               </td>
               <td><input id="cdraft" type="checkbox" checked="true" /></td>
             </tr>
-            <tr>
+            <tr class="d-none">
               <td>
                 <h4>Comment</h4>
               </td>