Display the URL of RSS on the page - fix #171

foxmask · Jan 12, 2017 · 67628d4 · 67628d4
1 parent 80a7fd7
commit 67628d4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/django_th/templates/home.html b/django_th/templates/home.html
@@ -63,6 +63,9 @@
                         &nbsp;-&nbsp;
                         <span class="glyphicon glyphicon-calendar"></span>&nbsp;{% trans "Triggered" %}&nbsp;{% if trigger.date_triggered %}{{ trigger.date_triggered }}{% else %}&nbsp;{% trans "Never triggered" %}{% endif %}
                     </p>
+                    {%  if trigger.consumer.name.name == 'ServiceRss' %}
+                    <p class="text-ok"><a href="{% url 'edit_consumer' trigger.id %}" >{% trans "Click here to see your Feeds URL for" %} {{ trigger.provider.name|service_readable_class|lower }}</a></p>
+                    {%  endif %}
                     <p class="text-{% if trigger.result == 'OK' %}info{%  else  %}warning{%  endif %}">
                         <span class="glyphicon glyphicon-bullhorn"></span> {{ trigger.result }} - {{ trigger.date_result }}
                     </p>

diff --git a/django_th/views_fbv.py b/django_th/views_fbv.py
@@ -226,5 +226,7 @@ def trigger_edit(request, trigger_id, edit_what):
     else:
         form = get_service(my_service, 'forms', form_name)(instance=data)
 
-    context = {'description': service.description, 'edit_what': edit_what}
+    context = {'description': service.description,
+               'edit_what': edit_what,
+               'data': data}
     return render(request, template, {'form': form, 'context': context})
diff --git a/th_rss/templates/rss/edit_consumer.html b/th_rss/templates/rss/edit_consumer.html
@@ -19,8 +19,8 @@ <h3><span class="glyphicon glyphicon-edit"></span> {% trans 'Edition of the prop
             </div>
 
             <div class="form-group">
-                <label for="id_url" class="col-sm-2 control-label">UUID {% trans "generated for your RSS" %}</label>
-                <div class="col-sm-10">{{ context.uuid }}</div>
+                <label for="id_uuid" class="col-sm-2 control-label">UUID {% trans "generated for your RSS" %}</label>
+                <div class="col-sm-10"><a href="{% if request.is_secure %}https{%  else %}http{%  endif %}://{{ request.get_host }}/th/myfeeds/{{ context.data.uuid }}">{% if request.is_secure %}https{%  else %}http{%  endif %}://{{ request.get_host }}/th/myfeeds/{{ context.data.uuid }}</a></div>
             </div>
 
             <div class="form-group form-actions">