Django

Code

Changeset 6898

Show
Ignore:
Timestamp:
12/05/07 23:00:37 (1 year ago)
Author:
russellm
Message:

newforms-admin: Modified the contrib.admin widget tests to allow for deployment in projects that contain non-default MEDIA_URL and ADMIN_MEDIA_PREFIX settings

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin/django/contrib/admin/tests/__init__.py

    r6782 r6898  
    1 from django.contrib.admin.tests import widgets 
     1from django.contrib.admin.tests.widgets import WIDGET_TESTS 
    22 
    33__test__ = { 
    4     'WIDGET_TESTS': widgets, 
     4    'WIDGET_TESTS': WIDGET_TESTS, 
    55} 

  • django/branches/newforms-admin/django/contrib/admin/tests/widgets.py

    r6782 r6898  
    1 """ 
     1from django.conf import settings 
     2 
     3WIDGET_TESTS = """ 
    24>>> from datetime import datetime 
    35>>> from django.utils.html import escape, conditional_escape 
    …… 
    1719>>> print conditional_escape(w.render('test', 'test')) 
    1820<select multiple="multiple" name="test"> 
    19 </select><script type="text/javascript">addEvent(window, "load", function(e) {SelectFilter.init("id_test", "test", 0, "/media/"); });</script> 
     21</select><script type="text/javascript">addEvent(window, "load", function(e) {SelectFilter.init("id_test", "test", 0, "%(ADMIN_MEDIA_PREFIX)s"); });</script> 
    2022<BLANKLINE> 
    2123 
    …… 
    2628>>> w = AdminFileWidget() 
    2729>>> print conditional_escape(w.render('test', 'test')) 
    28 Currently: <a target="_blank" href="test">test</a> <br>Change: <input type="file" name="test" /> 
     30Currently: <a target="_blank" href="%(MEDIA_URL)stest">test</a> <br>Change: <input type="file" name="test" /> 
    2931 
    3032>>> rel = LogEntry._meta.get_field('user').rel 
    3133>>> w = ForeignKeyRawIdWidget(rel) 
    3234>>> print conditional_escape(w.render('test', 'test', attrs={})) 
    33 <input type="text" name="test" value="test" class="vForeignKeyRawIdAdminField" /><a href="../../../auth/user/" class="related-lookup" id="lookup_id_test" onclick="return showRelatedObjectLookupPopup(this);"> <img src="/media/img/admin/selector-search.gif" width="16" height="16" alt="Lookup"></a> 
     35<input type="text" name="test" value="test" class="vForeignKeyRawIdAdminField" /><a href="../../../auth/user/" class="related-lookup" id="lookup_id_test" onclick="return showRelatedObjectLookupPopup(this);"> <img src="%(ADMIN_MEDIA_PREFIX)simg/admin/selector-search.gif" width="16" height="16" alt="Lookup"></a> 
    3436 
    35 """ 
     37""" % { 
     38    'ADMIN_MEDIA_PREFIX': settings.ADMIN_MEDIA_PREFIX, 
     39    'MEDIA_URL': settings.MEDIA_URL 
     40}