浏览代码

more bugfixes on create bookmark, feature silver

control 3 年之前
父节点
当前提交
dbed2cfe21
共有 4 个文件被更改,包括 11 次插入7 次删除
  1. 二进制
      app/database.db
  2. 二进制
      app/database.db.bak
  3. 7 3
      app/logic.py
  4. 4 4
      app/templates/create_bookmark.html

二进制
app/database.db


二进制
app/database.db.bak


+ 7 - 3
app/logic.py

@@ -53,22 +53,26 @@ def home():
 def create():
 def create():
 
 
     bgroups = Groups.query.filter_by(owner=current_user.id).all()
     bgroups = Groups.query.filter_by(owner=current_user.id).all()
-    print(bgroups[0].group)##
+    for bg in bgroups:##
+        print(bg.group)##
 
 
     if request.method == 'POST':
     if request.method == 'POST':
         wlink = request.form.get('web_link')
         wlink = request.form.get('web_link')
         wname = request.form.get('web_name')
         wname = request.form.get('web_name')
         wgroup = request.form.get('web_group')
         wgroup = request.form.get('web_group')
+        ngroup = request.form.get('new_group')
         wstatus = request.form.get('share_public_private')
         wstatus = request.form.get('share_public_private')
 
 
-        print(wlink, wname, wgroup, wstatus)
-        if wlink and wname and wgroup and wstatus:
+        if wlink and wname and wstatus:
+            if wgroup == 'cng-555' and ngroup != '':
+                wgroup = ngroup
             new_link = Bookmark(owner=current_user.id, status=wstatus, name=wname, group=wgroup, link=wlink)
             new_link = Bookmark(owner=current_user.id, status=wstatus, name=wname, group=wgroup, link=wlink)
             group_check = Groups.query.filter_by(group=wgroup).first()
             group_check = Groups.query.filter_by(group=wgroup).first()
             if not group_check:
             if not group_check:
                 new_group = Groups(owner=current_user.id, group=wgroup)
                 new_group = Groups(owner=current_user.id, group=wgroup)
                 db.session.add(new_group)
                 db.session.add(new_group)
             db.session.add(new_link)
             db.session.add(new_link)
+            print(wlink, wname, wgroup, ngroup, wstatus)##
             db.session.commit()
             db.session.commit()
             flash('New Bookmark added!', category='success')
             flash('New Bookmark added!', category='success')
 
 

+ 4 - 4
app/templates/create_bookmark.html

@@ -36,13 +36,13 @@
 
 
                     <div class="form-outline mb-4">
                     <div class="form-outline mb-4">
                         <label class="form-label" for="web_group">Existing Groups</label><br>
                         <label class="form-label" for="web_group">Existing Groups</label><br>
-                        <select name="web_group" style="padding-right: 130px;"> 
+                        <select name="web_group" style="padding-right: 80px;"> 
+                          <option value="cng-555">Create new group:</option>
                           {% for bg in bgroups %}
                           {% for bg in bgroups %}
-                          <option name="web_group" value={{ bg.group }}>{{ bg.group }}</option>
+                          <option name="web_group" value="{{ bg.group }}">{{ bg.group }}</option>
                           {% endfor %}
                           {% endfor %}
-                          <option value="custom">Custom</option>   
                         </select>
                         </select>
-                        <input type="text" name="web_group" id="web_group" style='position:relative; left:50px; padding-right: 60px;' placeholder="Create new group here"/>
+                        <input type="text" name="new_group" style='position:relative; left:30px; padding-right: 90px;' placeholder="Name new group here"/>
                     </div>  
                     </div>  
                     
                     
                     <div class="form-outline mb-4">
                     <div class="form-outline mb-4">