Connecting WL + publishing author.

diff --git a/src/apiclient/views.py b/src/apiclient/views.py
index b2f3aac..e43ae0c 100644 (file)
--- a/src/apiclient/views.py
+++ b/src/apiclient/views.py
@@ -61,7 +61,7 @@ def oauth_callback(request, beta=False):
     conn.token_secret = access_token['oauth_token_secret']
     conn.save()
 
     conn.token_secret = access_token['oauth_token_secret']
     conn.save()
 

-    return HttpResponseRedirect('/')
+    return HttpResponseRedirect(reverse('documents_user'))

 
 
 @login_required
 
 
 @login_required

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index 635af5f..5ea1bbe 100644 (file)
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -221,6 +221,13 @@ def publish_author(request, pk):
     data = {
         "name_pl": author.name,
         "description_pl": author.generate_description(),
     data = {
         "name_pl": author.name,
         "description_pl": author.generate_description(),

+        "genitive": author.genitive,
+        "gazeta_link": author.gazeta_link,
+        "culturepl_link": author.culturepl_link,
+        "wiki_link_pl": author.plwiki,
+        "photo": request.build_absolute_uri(author.photo.url),
+        "photo_source": author.photo_source,
+        "photo_attribution": author.photo_attribution,

     }
     apiclient.api_call(request.user, f"authors/{author.slug}/", data)
     return redirect(reverse('admin:catalogue_author_change', args=[author.pk]))
     }
     apiclient.api_call(request.user, f"authors/{author.slug}/", data)
     return redirect(reverse('admin:catalogue_author_change', args=[author.pk]))

diff --git a/src/documents/templates/documents/my_page.html b/src/documents/templates/documents/my_page.html
index 68c458e..0768ab9 100644 (file)
--- a/src/documents/templates/documents/my_page.html
+++ b/src/documents/templates/documents/my_page.html
@@ -22,12 +22,12 @@
 {% endblock leftcolumn %}
 
 {% block rightcolumn %}
 {% endblock leftcolumn %}
 
 {% block rightcolumn %}

-  {% if wllogin %}
-    <div class="card">
-      <div class="card-header">
-        <h2>Konto WL</h2>
-      </div>
-      <div class="card-body">
+  <div class="card mb-4">
+    <div class="card-header">
+      <h2>Konto WL</h2>
+    </div>
+    <div class="card-body">
+      {% if wllogin %}

         <p>
           Podłączone konto na Wolnych Lekturach:
           <strong>{{ wllogin }}</strong>
         <p>
           Podłączone konto na Wolnych Lekturach:
           <strong>{{ wllogin }}</strong>


@@ -38,10 +38,16 @@
             Odłącz
           </button>
         </form>
             Odłącz
           </button>
         </form>

-      </div>
-
+      {% else %}
+        <form method="post" action="{% url 'apiclient_oauth' %}">
+          {% csrf_token %}
+          <button class="btn btn-primary">
+            Podłącz konto
+          </button>
+        </form>
+      {% endif %}

     </div>
     </div>

-  {% endif %}
+  </div>

 
   <div class="card">
        <div class="card-header">
 
   <div class="card">
        <div class="card-header">