diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..73f69e0
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/.idea/OAPS-TreeLib-master.iml b/.idea/OAPS-TreeLib-master.iml
new file mode 100644
index 0000000..a4e9024
--- /dev/null
+++ b/.idea/OAPS-TreeLib-master.iml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
new file mode 100644
index 0000000..607000e
--- /dev/null
+++ b/.idea/dataSources.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ sqlite.xerial
+ true
+ org.sqlite.JDBC
+ jdbc:sqlite:C:\Users\97622\Desktop\OAPS-TreeLib-master\database.sqlite
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..105ce2d
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..172840b
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..fa83966
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/service.py b/service.py
index af5395e..5d92744 100644
--- a/service.py
+++ b/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']
diff --git a/templates/article.html b/templates/article.html
index 032959b..f298279 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -135,12 +135,15 @@ {{ article.title }}
+<<<<<<< HEAD
{% if comments %}
Number of comments :{{ comments|length }}
+=======
+>>>>>>> 4c444f8 (第一次提交)
{% for comment in comments[::-1] %}
@@ -152,7 +155,10 @@
{{ article.title }}
{% endfor %}
+<<<<<<< HEAD
{% endif %}
+=======
+>>>>>>> 4c444f8 (第一次提交)
{% endblock %}
diff --git a/templates/subject.html b/templates/subject.html
index a86d00e..ad37b73 100644
--- a/templates/subject.html
+++ b/templates/subject.html
@@ -58,6 +58,7 @@
You are in {{ url }}
+<<<<<<< HEAD