refactor to avoid passing to AdminChooser

pull/888/merge
Matt Westcott 2015-02-20 15:43:09 +00:00
rodzic 32e78d5920
commit 6040b3ada4
9 zmienionych plików z 9 dodań i 31 usunięć

Wyświetl plik

@ -17,7 +17,7 @@
<li><input type="button" class="action-clear button-small button-secondary" value="{{ widget.clear_choice_text }}"></li>
{% endif %}
<li><input type="button" class="action-choose button-small button-secondary" value="{{ widget.choose_another_text }}"></li>
<li><a href="{{ widget.link_to_chosen_url }}" class="edit-link button button-small button-secondary" target="_blank">{{ widget.link_to_chosen_text }}</a></li>
<li><a href="{% block edit_chosen_item_url %}#{% endblock %}" class="edit-link button button-small button-secondary" target="_blank">{{ widget.link_to_chosen_text }}</a></li>
</ul>
</div>

Wyświetl plik

@ -3,3 +3,5 @@
{% block chosen_state_view %}
<span class="title">{{ page.title }}</span>
{% endblock %}
{% block edit_chosen_item_url %}{% if page %}{% url 'wagtailadmin_pages_edit' page.id %}{% endif %}{% endblock %}

Wyświetl plik

@ -41,7 +41,6 @@ class AdminChooser(WidgetWithScript, widgets.Input):
choose_one_text = _("Choose an item")
choose_another_text = _("Choose another item")
clear_choice_text = _("Clear choice")
link_to_chosen_url = "#"
link_to_chosen_text = _("Edit this item")
def get_instance(self, model_class, value):
@ -72,8 +71,6 @@ class AdminChooser(WidgetWithScript, widgets.Input):
self.clear_choice_text = kwargs.pop('clear_choice_text')
if 'link_to_chosen_text' in kwargs:
self.link_to_chosen_text = kwargs.pop('link_to_chosen_text')
if 'link_to_chosen_url' in kwargs:
self.link_to_chosen_url = kwargs.pop('link_to_chosen_url')
super(AdminChooser, self).__init__(**kwargs)
@ -81,7 +78,6 @@ class AdminPageChooser(AdminChooser):
target_content_type = None
choose_one_text = _('Choose a page')
choose_another_text = _('Choose another page')
link_to_chosen_url = "#"
link_to_chosen_text = _('Edit this page')
def __init__(self, content_type=None, **kwargs):
@ -94,11 +90,6 @@ class AdminPageChooser(AdminChooser):
model_class = self.target_content_type.model_class()
instance = self.get_instance(model_class, value)
try:
self.link_to_chosen_url = reverse('wagtailadmin_pages_edit', args=(instance.id,))
except AttributeError:
pass
return render_to_string("wagtailadmin/widgets/page_chooser.html", {
'widget': self,
'original_field_html': original_field_html,

Wyświetl plik

@ -4,3 +4,5 @@
{% block chosen_state_view %}
<span class="title">{{ document.title }}</span>
{% endblock %}
{% block edit_chosen_item_url %}{% if document %}{% url 'wagtaildocs_edit_document' document.id %}{% endif %}{% endblock %}

Wyświetl plik

@ -2,7 +2,6 @@ from __future__ import absolute_import, unicode_literals
import json
from django.core.urlresolvers import reverse
from django.template.loader import render_to_string
from django.utils.translation import ugettext_lazy as _
@ -13,7 +12,6 @@ from wagtail.wagtaildocs.models import Document
class AdminDocumentChooser(AdminChooser):
choose_one_text = _('Choose a document')
choose_another_text = _('Choose another document')
link_to_chosen_url = "#"
link_to_chosen_text = _('Edit this document')
def render_html(self, name, value, attrs):
@ -21,11 +19,6 @@ class AdminDocumentChooser(AdminChooser):
instance = self.get_instance(Document, value)
try:
self.link_to_chosen_url = reverse('wagtaildocs_edit_document', args=(instance.id,))
except AttributeError:
pass
return render_to_string("wagtaildocs/widgets/document_chooser.html", {
'widget': self,
'original_field_html': original_field_html,

Wyświetl plik

@ -12,3 +12,5 @@
{% endif %}
</div>
{% endblock %}
{% block edit_chosen_item_url %}{% if image %}{% url 'wagtailimages_edit_image' image.id %}{% endif %}{% endblock %}

Wyświetl plik

@ -2,7 +2,6 @@ from __future__ import absolute_import, unicode_literals
import json
from django.core.urlresolvers import reverse
from django.template.loader import render_to_string
from django.utils.translation import ugettext_lazy as _
@ -13,7 +12,6 @@ from wagtail.wagtailimages.models import get_image_model
class AdminImageChooser(AdminChooser):
choose_one_text = _('Choose an image')
choose_another_text = _('Choose another image')
link_to_chosen_url = "#"
link_to_chosen_text = _('Edit this image')
def __init__(self, **kwargs):
@ -25,11 +23,6 @@ class AdminImageChooser(AdminChooser):
instance = self.get_instance(self.image_model, value)
try:
self.link_to_chosen_url = reverse('wagtailimages_edit_image', args=(instance.id,))
except AttributeError:
pass
return render_to_string("wagtailimages/widgets/image_chooser.html", {
'widget': self,
'original_field_html': original_field_html,

Wyświetl plik

@ -5,3 +5,5 @@
{% block chosen_state_view %}
<span class="title">{{ item }}</span>
{% endblock %}
{% block edit_chosen_item_url %}{% if item %}{% url 'wagtailsnippets_edit' widget.target_content_type.app_label widget.target_content_type item.id %}{% endif %}{% endblock %}

Wyświetl plik

@ -2,7 +2,6 @@ from __future__ import absolute_import, unicode_literals
import json
from django.core.urlresolvers import reverse
from django.template.loader import render_to_string
from django.utils.translation import ugettext_lazy as _
@ -11,7 +10,6 @@ from wagtail.wagtailadmin.widgets import AdminChooser
class AdminSnippetChooser(AdminChooser):
target_content_type = None
link_to_chosen_url = "#"
def __init__(self, content_type=None, **kwargs):
if 'snippet_type_name' in kwargs:
@ -30,11 +28,6 @@ class AdminSnippetChooser(AdminChooser):
model_class = self.target_content_type.model_class()
instance = self.get_instance(model_class, value)
try:
self.link_to_chosen_url = reverse('wagtailsnippets_edit', args=(self.target_content_type.app_label, self.target_content_type, instance.id,))
except AttributeError:
pass
return render_to_string("wagtailsnippets/widgets/snippet_chooser.html", {
'widget': self,
'original_field_html': original_field_html,