Ticket #13221: django.patch

contrib/admin/media/css/widgets.css

@@ -504 +504 @@
     border-top: 1px solid #ddd;
 }
 
+form .vManyToManyRawIdAdminField + strong > ul{
+        display:inline-block;
+        margin-left:0px;
+        padding:0 5px 0 0;
+}
+
+.vForeignKeyRawIdAdminField + strong, .vManyToManyRawIdAdminField + strong ul li,.related-clear{
+        cursor:pointer;
+        margin:0 2px;
+}
+
+strong:empty + a.related-clear {display:none;}

contrib/admin/media/js/admin/RelatedObjectLookups.js

@@ -41 +41 @@
     return false;
 }
 
-function dismissRelatedLookupPopup(win, chosenId) {
+function dismissRelatedLookupPopup(win, chosenId, choosenRepr) {
+        if(choosenRepr == null)
+                choosenRepr = choosenId;
     var name = windowname_to_id(win.name);
     var elem = document.getElementById(name);
-    if (elem.className.indexOf('vManyToManyRawIdAdminField') != -1 && elem.value) {
+    var display = elem;
+    while (display.tagName != 'STRONG')
+                display = display.nextElementSibling;
+    if (elem.className.indexOf('vManyToManyRawIdAdminField') != -1) {
         elem.value += ',' + chosenId;
+        var li = document.createElement('LI')
+                if( li.attachEvent ) {
+                        li.attachEvent('onclick', 'go_to(this,'+chosenId+')');
+                } else {
+                        li.setAttribute('onclick', 'go_to(this,'+chosenId+')');
+                }
+                li.innerHTML = choosenRepr+'<a class="related-clear" onclick="return clear_related(this,'+chosenId+')">X</a>';
+        for (var i = 0; i < display.childNodes.length; i++)
+                        if (display.childNodes[i].tagName == 'UL')
+                                display.childNodes[i].appendChild(li);
     } else {
-        document.getElementById(name).value = chosenId;
+        elem.value = chosenId;
+                display.innerHTML = choosenRepr;
+                display.className = display.className;
     }
     win.close();
 }
@@ -73 +90 @@
     newRepr = html_unescape(newRepr);
     var name = windowname_to_id(win.name);
     var elem = document.getElementById(name);
+    var display = elem;
+    while(display.tagName != 'STRONG')
+                display = display.nextElementSibling;
     if (elem) {
         if (elem.nodeName == 'SELECT') {
             var o = new Option(newRepr, newId);
             elem.options[elem.options.length] = o;
             o.selected = true;
         } else if (elem.nodeName == 'INPUT') {
-            if (elem.className.indexOf('vManyToManyRawIdAdminField') != -1 && elem.value) {
+            if (elem.className.indexOf('vManyToManyRawIdAdminField') != -1) {
                 elem.value += ',' + newId;
+                var li = document.createElement('LI')
+                                if( li.attachEvent ) {
+                                        li.attachEvent('onclick', 'go_to(this,'+newId+')');
+                                } else {
+                                        li.setAttribute('onclick', 'go_to(this,'+newId+')');
+                                }
+                                li.innerHTML = newRepr+'<a class="related-clear" onclick="return clear_related(this,'+newId+')">X</a>';
+                for (var i = 0; i < display.childNodes.length; i++)
+                                        if (display.childNodes[i].tagName == 'UL') {
+                                                display.childNodes[i].appendChild(li);
+                                                break;
+                                        }
             } else {
                 elem.value = newId;
+                        display.innerHTML = newRepr;
+                                display.className = display.className;
             }
         }
     } else {
@@ -94 +128 @@
     }
     win.close();
 }
+
+function go_to(el,id){
+        if (id == null) {
+                while(el.tagName != 'INPUT')
+                        el = el.previousElementSibling;
+                id = el.value;
+        } else
+                el = el.parentNode.parentNode;
+        if ( id ) {
+                while( el.className.indexOf('related-lookup') == -1 )
+                        el = el.nextElementSibling;
+                window.open(el.href.replace(/\?.*/,'')+id+'/', '_blank');
+        }
+}
+
+function clear_related(el,id){
+        if ( id ){
+                el=el.parentNode;
+                while(el.tagName != 'LI')
+                        el = el.parentNode;
+                var tg = el.parentNode;
+                tg.removeChild(el);
+                while(tg.tagName != 'STRONG')
+                        tg = tg.parentNode;
+                while(tg.tagName != 'INPUT')
+                        tg = tg.previousElementSibling;
+                tg.value = clear_ids(tg.value.replace(id,'','g').split(','));
+        } else {
+                while(el.tagName != 'STRONG')
+                        el = el.previousElementSibling;
+                el.innerHTML = '';
+                el.className = el.className;
+                while(el.tagName != 'INPUT')
+                        el = el.previousElementSibling;
+                el.value = '';
+        }
+}
+
+function clear_ids(list){
+        var new_list = [];
+        for(var i in list)
+                if (list[i] && new_list.indexOf(list[i]) == -1)
+                        new_list.push(list[i]);
+        return new_list;
+}

contrib/admin/options.py

@@ -522 +522 @@
             for formset in formsets:
                 for added_object in formset.new_objects:
                     change_message.append(_('Added %(name)s "%(object)s".')
-                                          % {'name': added_object._meta.verbose_name,
+                                          % {'name': force_unicode(added_object._meta.verbose_name),
                                              'object': force_unicode(added_object)})
                 for changed_object, changed_fields in formset.changed_objects:
                     change_message.append(_('Changed %(list)s for %(name)s "%(object)s".')
                                           % {'list': get_text_list(changed_fields, _('and')),
-                                             'name': changed_object._meta.verbose_name,
+                                             'name': force_unicode(changed_object._meta.verbose_name),
                                              'object': force_unicode(changed_object)})
                 for deleted_object in formset.deleted_objects:
                     change_message.append(_('Deleted %(name)s "%(object)s".')
-                                          % {'name': deleted_object._meta.verbose_name,
+                                          % {'name': force_unicode(deleted_object._meta.verbose_name),
                                              'object': force_unicode(deleted_object)})
         change_message = ' '.join(change_message)
         return change_message or _('No fields changed.')

contrib/admin/templatetags/admin_list.py

@@ -225 +225 @@
             value = result.serializable_value(attr)
             result_id = repr(force_unicode(value))[1:]
             yield mark_safe(u'<%s%s><a href="%s"%s>%s</a></%s>' % \
-                (table_tag, row_class, url, (cl.is_popup and ' onclick="opener.dismissRelatedLookupPopup(window, %s); return false;"' % result_id or ''), conditional_escape(result_repr), table_tag))
+                (table_tag, row_class, url, (cl.is_popup and ' onclick="opener.dismissRelatedLookupPopup(window, %s, \'%s\'); return false;"' % (result_id or '',escape(result))), conditional_escape(result), table_tag))
         else:
             # By default the fields come from ModelAdmin.list_editable, but if we pull
             # the fields out of the form instead of list_editable custom admins

contrib/admin/widgets.py

@@ -117 +117 @@
             url = ''
         if not attrs.has_key('class'):
             attrs['class'] = 'vForeignKeyRawIdAdminField' # The JavaScript looks for this hook.
+        attrs['readonly'] = 1
         output = [super(ForeignKeyRawIdWidget, self).render(name, value, attrs)]
+        if value:
+            tvalue = self.value_for_label(value)
+        else:
+            tvalue = ''
+        output.append(self.label_for_tvalue(tvalue))
         # TODO: "id_" is hard-coded here. This should instead use the correct
         # API to determine the ID dynamically.
         output.append('<a href="%s%s" class="related-lookup" id="lookup_id_%s" onclick="return showRelatedObjectLookupPopup(this);"> ' % \
             (related_url, url, name))
         output.append('<img src="%simg/admin/selector-search.gif" width="16" height="16" alt="%s" /></a>' % (settings.ADMIN_MEDIA_PREFIX, _('Lookup')))
-        if value:
-            output.append(self.label_for_value(value))
         return mark_safe(u''.join(output))
 
     def base_url_parameters(self):
@@ -146 +150 @@
         params.update({TO_FIELD_VAR: self.rel.get_related_field().name})
         return params
 
-    def label_for_value(self, value):
+    def value_for_label(self, value):
         key = self.rel.get_related_field().name
         obj = self.rel.to._default_manager.get(**{key: value})
-        return '&nbsp;<strong>%s</strong>' % escape(truncate_words(obj, 14))
+        return escape(truncate_words(obj, 14))
+
+    def label_for_tvalue(self, tvalue):
+        return '&nbsp;<strong onClick="go_to(this);">%s</strong><a class="related-clear" onclick="return clear_related(this)" title="%s">X</a>' % (tvalue,_('Clear'))
 
 class ManyToManyRawIdWidget(ForeignKeyRawIdWidget):
     """
@@ -170 +177 @@
     def url_parameters(self):
         return self.base_url_parameters()
 
-    def label_for_value(self, value):
-        return ''
+    def value_for_label(self, value):
+        result = ''
+        key = self.rel.get_related_field().name
+        for i in value.split(','):
+            obj = self.rel.to._default_manager.get(**{key: int(i)})
+            result += '<li onClick="go_to(this,%s);"><a class="related-clear" onclick="return clear_related(this,%s)" title="%s">X</a></li>' %(i,escape(truncate_words(obj, 14)),i,_('Clear'))
+        return result
+
+    def label_for_tvalue(self, tvalue):
+        return '&nbsp;<strong><ul>%s</ul></strong>' % tvalue
 
     def value_from_datadict(self, data, files, name):
         value = data.get(name, None)