From 6eebfe67b80b25b798d53f94e8d8b8286d150301 Mon Sep 17 00:00:00 2001
From: doubaniux <goodsir@vivaldi.net>
Date: Thu, 7 May 2020 16:23:57 +0800
Subject: [PATCH] fix user home page link issue

---
 boofilsic/settings.py             | 6 +++---
 books/templates/books/list.html   | 2 +-
 common/static/js/home.js          | 4 ++--
 common/templates/common/home.html | 2 +-
 users/templates/users/list.html   | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/boofilsic/settings.py b/boofilsic/settings.py
index 790af76b..d2951709 100644
--- a/boofilsic/settings.py
+++ b/boofilsic/settings.py
@@ -86,7 +86,7 @@ if DEBUG:
             'NAME': 'test',
             'USER': 'donotban',
             'PASSWORD': 'donotbansilvousplait',
-            'HOST': '192.168.13.68',
+            'HOST': '172.18.96.109',
             'OPTIONS': {
                 'client_encoding': 'UTF8',
                 # 'isolation_level': psycopg2.extensions.ISOLATION_LEVEL_DEFAULT,
@@ -173,8 +173,8 @@ AUTH_USER_MODEL = 'users.User'
 MEDIA_URL = '/media/'
 MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
 
-CLIENT_ID = 'kEbwT9Je5HHg4FoLx4nb0tNaIrPNs5Mw6AYlQlsj2_4'
-CLIENT_SECRET = 'xwmEvlmudLCkBmvdzGf8m41Ug5o5di9xnDqeVLrcKSg'
+CLIENT_ID = 'kEbwT9Je5HsadfNs5Mw6Asht456YlQl54t4sj2_4'
+CLIENT_SECRET = 'xwmEvlmudLCkBmvdzGf8msdfgsdfggs5di9xnDqeVLrcKSg'
 
 # Path to save report related images, ends without slash
 REPORT_MEDIA_PATH_ROOT = 'report/'
diff --git a/books/templates/books/list.html b/books/templates/books/list.html
index 51b25aba..3a0c57bd 100644
--- a/books/templates/books/list.html
+++ b/books/templates/books/list.html
@@ -202,7 +202,7 @@
     <div id="mastodonURI" hidden="true">{% mastodon %}</div>
     <!--current user mastodon id--> 
     <div id="userMastodonID" hidden="true">{{ user.mastodon_id }}</div>
-    <div id="userPageURL" hidden="true">{% url 'users:home' 0 %}</div>
+    <div id="userPageURL" hidden="true">{% url 'users:home' 0 %}?is_mastodon_id=true</div>
     <div class="spinner" id="spinner" hidden>
         <div class="lds-spinner">
           <div></div>
diff --git a/common/static/js/home.js b/common/static/js/home.js
index 6ae4cdf9..42a9b808 100644
--- a/common/static/js/home.js
+++ b/common/static/js/home.js
@@ -53,7 +53,7 @@ $(document).ready( function() {
                     } else {
                         temp.find("a").text(data.username);
                     }
-                    let url = $("#userPageURL").text().replace('0', data.id) + "?is_mastodon_id=true";
+                    let url = $("#userPageURL").text().replace('0', data.id);
                     temp.find("a").attr('href', url);
                     $(".mast-followers").append(temp);
                 });
@@ -84,7 +84,7 @@ $(document).ready( function() {
                     } else {
                         temp.find("a").text(data.username);
                     }
-                    let url = $("#userPageURL").text().replace('0', data.id) + "?is_mastodon_id=true";
+                    let url = $("#userPageURL").text().replace('0', data.id);
                     temp.find("a").attr('href', url);
                     $(".mast-following").append(temp);
                 });
diff --git a/common/templates/common/home.html b/common/templates/common/home.html
index 194f04e3..7b935c56 100644
--- a/common/templates/common/home.html
+++ b/common/templates/common/home.html
@@ -177,7 +177,7 @@
     <div id="mastodonURI" hidden="true">{% mastodon %}</div>
     <!--current user mastodon id--> 
     <div id="userMastodonID" hidden="true">{{ user.mastodon_id }}</div>
-    <div id="userPageURL" hidden="true">{% url 'users:home' 0 %}</div>
+    <div id="userPageURL" hidden="true">{% url 'users:home' 0 %}?is_mastodon_id=true</div>
     <div class="spinner" id="spinner" hidden>
         <div class="lds-spinner">
           <div></div>
diff --git a/users/templates/users/list.html b/users/templates/users/list.html
index 767a2942..e5b3c781 100644
--- a/users/templates/users/list.html
+++ b/users/templates/users/list.html
@@ -124,7 +124,7 @@
     <div id="mastodonURI" hidden="true">{% mastodon %}</div>
     <!--current user mastodon id--> 
     <div id="userMastodonID" hidden="true">{{ user.mastodon_id }}</div>
-    <div id="userPageURL" hidden="true">{% url 'users:home' 0 %}</div>
+    <div id="userPageURL" hidden="true">{% url 'users:home' 0 %}?is_mastodon_id=true</div>
     <div class="spinner" id="spinner" hidden>
         <div class="lds-spinner">
           <div></div>