Commit b6a957f0 authored by Andrew Godwin's avatar Andrew Godwin
Browse files

Merge remote-tracking branch 'core/master' into schema-alteration 

Conflicts:
	docs/ref/django-admin.txt
parents 52edc160 3c030040

AUTHORS

+5 −0
Original line number Diff line number Diff line
@@ -317,6 +317,7 @@ answer newbie questions, and generally made Django that much better: 
    Michael Josephson <http://www.sdjournal.com/>

    jpellerin@gmail.com

    junzhang.jn@gmail.com

    Krzysztof Jurewicz <krzysztof.jurewicz@gmail.com>

    Xia Kai <http://blog.xiaket.org/>

    Antti Kaihola <http://djangopeople.net/akaihola/>

    Peter van Kampen
@@ -418,6 +419,7 @@ answer newbie questions, and generally made Django that much better: 
    Christian Metts

    michal@plovarna.cz

    Justin Michalicek <jmichalicek@gmail.com>

    Bojan Mihelac <bmihelac@mihelac.org>

    Slawek Mikula <slawek dot mikula at gmail dot com>

    Katie Miller <katie@sub50.com>

    Shawn Milochik <shawn@milochik.com>
@@ -440,6 +442,7 @@ answer newbie questions, and generally made Django that much better: 
    Gopal Narayanan <gopastro@gmail.com>

    Fraser Nevett <mail@nevett.org>

    Sam Newman <http://www.magpiebrain.com/>

    Alasdair Nicol <http://al.sdair.co.uk/>

    Ryan Niemeyer <https://profiles.google.com/ryan.niemeyer/about>

    Filip Noetzel <http://filip.noetzel.co.uk/>

    Afonso Fernández Nogueira <fonzzo.django@gmail.com>
@@ -537,6 +540,7 @@ answer newbie questions, and generally made Django that much better: 
    Brenton Simpson <http://theillustratedlife.com>

    Jozko Skrablin <jozko.skrablin@gmail.com>

    Ben Slavin <benjamin.slavin@gmail.com>

    Jonathan Slenders

    sloonz <simon.lipp@insa-lyon.fr>

    Paul Smith <blinkylights23@gmail.com>

    Steven L. Smith (fvox13) <steven@stevenlsmith.com>
@@ -573,6 +577,7 @@ answer newbie questions, and generally made Django that much better: 
    Aaron Swartz <http://www.aaronsw.com/>

    Ville Säävuori <http://www.unessa.net/>

    Mart Sõmermaa <http://mrts.pri.ee/>

    Susan Tan <susan.tan.fleckerl@gmail.com>

    Christian Tanzer <tanzer@swing.co.at>

    Tyler Tarabula <tyler.tarabula@gmail.com>

    Tyson Tate <tyson@fallingbullets.com>

django/conf/global_settings.py

+5 −0
Original line number Diff line number Diff line
@@ -313,6 +313,11 @@ FILE_UPLOAD_TEMP_DIR = None 
# you'd pass directly to os.chmod; see http://docs.python.org/lib/os-file-dir.html.

FILE_UPLOAD_PERMISSIONS = None



# The numeric mode to assign to newly-created directories, when uploading files.

# The value should be a mode as you'd pass to os.chmod;

# see http://docs.python.org/lib/os-file-dir.html.

FILE_UPLOAD_DIRECTORY_PERMISSIONS = None



# Python module path where user will place custom format definition.

# The directory where this setting is pointing should contain subdirectories

# named as the locales, containing a formats.py file

django/contrib/admin/static/admin/css/dashboard.css

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ ul.actionlist li { 
    list-style-type: none;

}



ul.actionlist li.changelink {

ul.actionlist li {

    overflow: hidden;

    text-overflow: ellipsis;

    -o-text-overflow: ellipsis;

django/contrib/admin/util.py

+15 −11
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ from django.utils import timezone 
from django.utils.encoding import force_str, force_text, smart_text

from django.utils import six

from django.utils.translation import ungettext

from django.core.urlresolvers import reverse

from django.core.urlresolvers import reverse, NoReverseMatch



def lookup_needs_distinct(opts, lookup_path):

    """
@@ -113,12 +113,20 @@ def get_deleted_objects(objs, opts, user, admin_site, using): 
        has_admin = obj.__class__ in admin_site._registry

        opts = obj._meta



        no_edit_link = '%s: %s' % (capfirst(opts.verbose_name),

                                   force_text(obj))



        if has_admin:

            try:

                admin_url = reverse('%s:%s_%s_change'

                                    % (admin_site.name,

                                       opts.app_label,

                                       opts.model_name),

                                    None, (quote(obj._get_pk_val()),))

            except NoReverseMatch:

                # Change url doesn't exist -- don't display link to edit

                return no_edit_link



            p = '%s.%s' % (opts.app_label,

                           get_permission_codename('delete', opts))

            if not user.has_perm(p):
@@ -131,8 +139,7 @@ def get_deleted_objects(objs, opts, user, admin_site, using): 
        else:

            # Don't display link to edit, because it either has no

            # admin or is edited inline.

            return '%s: %s' % (capfirst(opts.verbose_name),

                                force_text(obj))

            return no_edit_link



    to_delete = collector.nested(format_callback)
@@ -155,9 +162,6 @@ class NestedObjects(Collector): 
            if source_attr:

                self.add_edge(getattr(obj, source_attr), obj)

            else:

                if obj._meta.proxy:

                    # Take concrete model's instance to avoid mismatch in edges

                    obj = obj._meta.concrete_model(pk=obj.pk)

                self.add_edge(None, obj)

        try:

            return super(NestedObjects, self).collect(objs, source_attr=source_attr, **kwargs)

django/contrib/admin/widgets.py

+2 −2
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ class AdminURLFieldWidget(forms.URLInput): 
        html = super(AdminURLFieldWidget, self).render(name, value, attrs)

        if value:

            value = force_text(self._format_value(value))

            final_attrs = {'href': mark_safe(smart_urlquote(value))}

            final_attrs = {'href': smart_urlquote(value)}

            html = format_html(

                '<p class="url">{0} <a{1}>{2}</a><br />{3} {4}</p>',

                _('Currently:'), flatatt(final_attrs), value,