Show club members in callsign details view

elnappo · May 2, 2019 · 028552e · 028552e
1 parent b2939d6
commit 028552e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/project_novis/callsign/templates/callsign/callsign_update_form.html b/project_novis/callsign/templates/callsign/callsign_update_form.html
@@ -64,7 +64,7 @@ <h3 class="box-title">Help</h3>
                     <a href="https://en.wikipedia.org/wiki/Digital_mobile_radio" target="_blank" rel="noopener">Digital mobile
                     radio (DMR)</a> is an open digital mobile radio standard. DMR IDs are regularly imported from
                     <a href="https://ham-digital.org/" target="_blank" rel="noopener">ham-digital.org</a> so there is
-                    no need to manually add your ID here.
+                    no need to manually add your DMR ID here.
                 </p>
             </div>
             <!-- /.box-body -->

diff --git a/project_novis/callsign/templates/callsign/club_box.html b/project_novis/callsign/templates/callsign/club_box.html
@@ -17,6 +17,22 @@ <h3 class="box-title">Club Information</h3>
                 <td><a href="{{ object.club.website }}" target="_blank" rel="noopener">{{ object.club.website }}</a></td>
             </tr>
             {% endif %}
+{#            <tr>#}
+{#                <td>Managed by</td>#}
+{#                <td><a href="{% url "callsign:callsign-html-detail" object.owner.primary_callsign %}">{{ object.owner.primary_callsign }}</a></td>#}
+{#            </tr>#}
+            {% if object.club.members.all %}
+            <tr>
+                <td>Members</td>
+                <td>
+                  <ul>
+                    {% for member in object.club.members.all %}
+                    <li><a href="{% url "callsign:callsign-html-detail" member.name %}">{{ member.name }}</a></li>
+                    {% endfor %}
+                  </ul>
+                </td>
+            </tr>
+            {% endif %}
             {% if object.club.description %}
             <tr>
                 <td>Description</td>

diff --git a/project_novis/callsign/templates/callsign/club_update_form.html b/project_novis/callsign/templates/callsign/club_update_form.html
@@ -43,13 +43,18 @@ <h3 class="box-title">Edit {{ object.callsign.name }} Club</h3>
               <h3 class="box-title">Help</h3>
             </div>
             <div class="box-body">
-                <strong>Members</strong>
+                <strong>Managed by</strong>
                 <p class="text-muted">
-                    Currently it is not possible to add memebers to your club. We are working on it.
+                    Your primary callsign is shown as "managed by", set your primary callsign <a href="{% url "profile_change" %}">here</a>.
                 </p>
             </div>
             <!-- /.box-body -->
         </div>
     </div>
 </div>
 {% endblock %}
+
+{% block extra_foot %}
+  <script type="text/javascript" src="{% static 'admin/js/vendor/jquery/jquery.js' %}"></script>
+  {{ form.media }}
+{% endblock %}
diff --git a/project_novis/callsign/templates/callsign/repeater_update_form.html b/project_novis/callsign/templates/callsign/repeater_update_form.html
@@ -53,7 +53,7 @@ <h3 class="box-title">Help</h3>
                     <a href="https://en.wikipedia.org/wiki/Digital_mobile_radio" target="_blank" rel="noopener">Digital mobile
                     radio (DMR)</a> is an open digital mobile radio standard. DMR IDs are regularly imported from
                     <a href="https://ham-digital.org/" target="_blank" rel="noopener">ham-digital.org</a> so there is
-                    no need to manually add your ID here.
+                    no need to manually add your DMR ID here.
                 </p>
             </div>
             <!-- /.box-body -->