-
-
Notifications
You must be signed in to change notification settings - Fork 622
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Selected tag ids are appended to url query parameter - tag ids are store in the session temporaily - tags are merged into new tag name - session is cleared of the tag IDs
- Loading branch information
1 parent
24e2d68
commit 0df866d
Showing
2 changed files
with
76 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,29 +1,29 @@ | ||
{% extends "admin/base_site.html" %} | ||
{% load i18n admin_urls %} | ||
|
||
{% block title %}{% trans 'Django site admin' %}{% endblock %} | ||
|
||
{% block content %} | ||
<div class="module"> | ||
<form method="post" id="merge-tags-form"> | ||
{% csrf_token %} | ||
{% for field in form %} | ||
<div class="form-row"> | ||
{{ field.label_tag }} | ||
{{ field }} | ||
{% if field.errors %} | ||
<div id="mergeTagsModal"> | ||
<div> | ||
<div> | ||
<div> | ||
<form | ||
id="merge-tags-form" | ||
method="post" | ||
action="{% url 'admin:merge_tags' %}" | ||
> | ||
{% csrf_token %} {% for field in form %} | ||
<div> | ||
{{ field.label_tag }} {{ field }} {% if field.errors %} | ||
<ul class="errorlist"> | ||
{% for error in field.errors %} | ||
<li>{{ error }}</li> | ||
{% endfor %} | ||
{% for error in field.errors %} | ||
<li>{{ error }}</li> | ||
{% endfor %} | ||
</ul> | ||
{% endif %} | ||
</div> | ||
{% endfor %} | ||
<div class="submit-row"> | ||
<!-- <input type="submit" value="Merge Tags" name="apply_merge" /> --> | ||
<button type="submit" class="button">Merge Tags</button> | ||
</div> | ||
</form> | ||
</div> | ||
{% endfor %} | ||
|
||
<div> | ||
<button type="submit" class="btn btn-primary">Merge Tags</button> | ||
</div> | ||
</form> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
{% endblock %} |