lkt-201836900127_add buttons to jump back to the ancestor category

service.py

@@ -315,9 +315,15 @@ def get_subject(subjectID):
     ).all()
     for x in a:
         hot_article.append(x)
+<<<<<<< HEAD
 
     return render_template('subject.html', url=url, subject_id=subject.id, articles=articles, hot_article=hot_article, Tool=Tool)
 
+=======
+    if not subject.pid  == "None" :
+        return render_template('subject.html', url=url, subject_id=subject.id,lasturl="http://127.0.0.1:5000/subject/"+str(subject.pid) ,articles=articles, hot_article=hot_article, Tool=Tool)
+    else :return render_template('subject.html', url=url, subject_id=subject.id,lasturl="http://127.0.0.1:5000/" ,articles=articles, hot_article=hot_article, Tool=Tool)
+>>>>>>> 4c444f8 (第一次提交)
 # ============================================================================================
 # before request
 # ============================================================================================
@@ -397,8 +403,11 @@ def find_subjects(subject, count):
 # ================================================================================
 @app.route('/edit_subcategory', methods=['GET', 'POST'])
 def add_sub_category():
+<<<<<<< HEAD
     if not session.get('logged_in'):
         return render_template('login.html')
+=======
+>>>>>>> 4c444f8 (第一次提交)
     if request.method == 'POST':
         subject_id = request.form['subject_id']
         subject_name = request.form['subject_name']

templates/article.html

@@ -135,12 +135,15 @@ <h2 class="card-title">{{ article.title }}</h2><!--title-->
 </div>
 </div><br>
 
+<<<<<<< HEAD
 {% if comments %}
 <div class="alert alert-primary">
     Number of comments :{{ comments|length }}
 </div>
 
 
+=======
+>>>>>>> 4c444f8 (第一次提交)
 {% for comment in comments[::-1] %}
     <div class="card">
         <div class="card-body">
@@ -152,7 +155,10 @@ <h2 class="card-title">{{ article.title }}</h2><!--title-->
         </div>
     </div>
 {% endfor %}
+<<<<<<< HEAD
 {% endif %}
+=======
+>>>>>>> 4c444f8 (第一次提交)
 
 
 {%  endblock %}

templates/subject.html

@@ -58,13 +58,23 @@
         <br><div class="card">
     <div class="card-body">
       <p class="card-text">You are in {{ url }}</p>
+<<<<<<< HEAD
         <form name="myform" method="get" onsubmit="return verify();">
             <input type="text" name="subject_id" style="display: none" value={{ subject_id }}><br>
         <button type="submit" class="btn btn-primary" onclick="postArticle()">post article</button>
             {% if session.get('logged_in') %}
         <button type="submit" class="btn btn-primary" onclick="createSubject()">add subcategory</button>
         <input type="checkbox" name="add_father" value="father" /> add main subject
             {% endif %}
+=======
+        <a href="{{lasturl}}">返回上一级</a>
+        <form name="myform" method="get" onsubmit="return verify();">
+            <input type="text" name="subject_id" style="display: none" value={{ subject_id }}>
+            <input type="email" name="email" id="email" placeholder="Enter Email to post or create" required="required"/><br><br>
+        <button type="submit" class="btn btn-primary" onclick="postArticle()">post article</button>
+        <button type="submit" class="btn btn-primary" onclick="createSubject()">add subcategory</button>
+        <input type="checkbox" name="add_father" value="father" /> add main subject
+>>>>>>> 4c444f8 (第一次提交)
         </form>
     </div>
   </div><br>