Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/daldal-Mango/Miracle30 into…
Browse files Browse the repository at this point in the history
… main
  • Loading branch information
dddooo9 committed Aug 28, 2021
2 parents 03d3d69 + 23703e6 commit 4ad8dfe
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion groups/templates/groups/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ <h2>{{dates|index_1:0}} ~ {{dates|index_1:29}}</h2>
{% for member in goal.member.all %}
{% if request.user == goal.manager %}
<a href="{% url 'groups:delete_member' goal.id member.id %}" class="a_deco"
onclick="return confirm('정말로 팀원은 퇴장시키겠습니까?😥')">{{member}}, </a>
onclick="return confirm('정말로 팀원은 퇴장시키겠습니까?😥')">&nbsp;&nbsp;{{member}}</a>
{% else %}
{{member}}
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion users/templates/users/mypage_update.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ <h1 class="my_title">마이페이지</h1>
</div>
</section>

<script src="{% static 'js/mypage.js' %}"></script>
<!-- <script src="{% static 'js/mypage.js' %}"></script> -->
{% endblock %}

0 comments on commit 4ad8dfe

Please sign in to comment.