Replace model._meta.module_name to ...model_name

Author: ptgolden

editorsnotes/admin/views/common.py

@@ -39,7 +39,7 @@ def collect_formsets(self):
         fs = {}
         if hasattr(self, 'formset_classes'):
             for formset in self.formset_classes:
-                prefix = formset.model._meta.module_name
+                prefix = formset.model._meta.model_name
 
                 fs_kwargs = self.get_form_kwargs()
                 fs_kwargs.pop('initial', 0)
@@ -171,7 +171,7 @@ def form_valid(self, form, formsets):
 
             # Set reversion metadata
             reversion.set_user(self.request.user)
-            reversion.set_comment('%sed %s.' % (action, self.object._meta.module_name))
+            reversion.set_comment('%sed %s.' % (action, self.object._meta.model_name))
             reversion.add_meta(RevisionProject, project=self.project)
 
             self.save_formsets(formsets)

editorsnotes/api/tests.py

@@ -118,7 +118,7 @@ def test_topic_api_create(self):
             'user': 'barry',
             'project': 'emma',
             #'time': ???,
-            'type': topic_obj._meta.module_name,
+            'type': topic_obj._meta.model_name,
             'url': topic_obj.get_absolute_url(),
             'title': topic_obj.as_text(),
             'action': 'added'
@@ -237,7 +237,7 @@ def test_topic_api_update(self):
             'user': 'barry',
             'project': 'emma',
             #'time': ???,
-            'type': updated_topic_obj._meta.module_name,
+            'type': updated_topic_obj._meta.model_name,
             'url': updated_topic_obj.get_absolute_url(),
             'title': updated_topic_obj.as_text(),
             'action': 'changed'
@@ -303,7 +303,7 @@ def test_topic_api_delete(self):
             'user': 'barry',
             'project': 'emma',
             #'time': ???,
-            'type': topic_obj._meta.module_name,
+            'type': topic_obj._meta.model_name,
             'url': None,
             'title': topic_obj.as_text(),
             'action': 'deleted'

editorsnotes/api/views/base.py

@@ -150,7 +150,7 @@ def get(self, request, **kwargs):
         ret = {'items': []}
 
         for model, instances in collector.data.items():
-            display_obj = rel_model.get(model._meta.module_name,
+            display_obj = rel_model.get(model._meta.model_name,
                                         lambda original, related: related)
             instances = [display_obj(obj, instance) for instance in instances]
             instances = filter(lambda instance: hasattr(instance, 'get_absolute_url'), instances)

editorsnotes/main/management/__init__.py

@@ -20,10 +20,10 @@ def _get_project_specific_permissions(model, is_concretely_inherited=False):
     auto_model_perms = _get_all_permissions(model._meta, ct)
 
     ignored_model_perms = IGNORED_PERMISSIONS.get(
-        '{}.{}'.format(model._meta.app_label, model._meta.module_name), ())
+        '{}.{}'.format(model._meta.app_label, model._meta.model_name), ())
     if is_concretely_inherited:
         ignored_model_perms += tuple(
-            '{}_{}'.format(action, model._meta.module_name)
+            '{}_{}'.format(action, model._meta.model_name)
             for action in ('add', 'change', 'delete'))
 
     return [perm for perm in Permission.objects.filter(content_type=ct)

editorsnotes/main/migrations/0135_make_log_entries.py

@@ -14,7 +14,7 @@ def forwards(self, orm):
         from editorsnotes.main.models.base import Administered
 
         administered_models = list(
-            m._meta.module_name for m in models.get_models()
+            m._meta.model_name for m in models.get_models()
             if issubclass(m, Administered))
 
         version_qs = orm['reversion.Version'].objects\

editorsnotes/main/models/base.py

@@ -26,20 +26,20 @@ class Meta:
 class Administered():
     def get_admin_url(self):
         return urlresolvers.reverse(
-            'admin:main_%s_change' % self._meta.module_name,
+            'admin:main_%s_change' % self._meta.model_name,
             args=(self.get_affiliation().slug, self.id,))
 
 class URLAccessible():
     @models.permalink
     def get_absolute_url(self):
-        return ('%s_view' % self._meta.module_name, [str(self.id)])
+        return ('%s_view' % self._meta.model_name, [str(self.id)])
     def __unicode__(self):
         return utils.truncate(self.as_text())
     def as_text(self):
-        raise Exception('Must implement %s.as_text()' % self._meta.module_name)
+        raise Exception('Must implement %s.as_text()' % self._meta.model_name)
     def as_html(self):
         return '<span class="%s">%s</span>' % (
-            self._meta.module_name, conditional_escape(self.as_text()))
+            self._meta.model_name, conditional_escape(self.as_text()))
 
 class OrderingManager(models.Manager):
     """

editorsnotes/main/models/topics.py

@@ -276,7 +276,7 @@ def topic_node_id(self):
     def __unicode__(self):
         return u'{} --> {}: {}'.format(
             self.topic.preferred_name,
-            self.content_object._meta.module_name,
+            self.content_object._meta.model_name,
             self.content_object)
     def get_affiliation(self):
         return self.topic.project

editorsnotes/main/templatetags/display.py

@@ -23,7 +23,7 @@ def as_html(tree):
 def as_link(obj, fragment=''):
     return mark_safe(
         '<a class="model-link %s-link" href="%s%s">%s</a>' % (
-            obj._meta.module_name, 
+            obj._meta.model_name,
             obj.get_absolute_url(), fragment, 
             obj.as_html()))
 

editorsnotes/main/views/navigation.py

@@ -26,7 +26,7 @@ def browse(request):
     max_count = 6
     o = {}
     for model in [TopicNode, Note, Document]:
-        model_name = model._meta.module_name
+        model_name = model._meta.model_name
         listname = '%s_list' % model_name
         query_set = model.objects.order_by('-last_updated')
 

editorsnotes/refine/models.py

@@ -10,7 +10,7 @@ class BaseCluster(models.Model):
     message = models.TextField(blank=True, null=True)
     @models.permalink
     def get_absolute_url(self):
-        return ('%s_view' % self._meta.module_name, [str(self.id)])
+        return ('%s_view' % self._meta.model_name, [str(self.id)])
     class Meta:
         abstract = True
 

editorsnotes/search/management/commands/rebuild_activity_index.py

@@ -14,7 +14,7 @@ def handle(self, *args, **kwargs):
         activity_index.create()
 
         administered_models = list(
-            m._meta.module_name for m in models.get_models()
+            m._meta.model_name for m in models.get_models()
             if issubclass(m, Administered))
 
         qs = Version.objects\

editorsnotes/search/types.py

@@ -12,7 +12,7 @@ class DocumentTypeAdapter(object):
     def __init__(self, es, index_name, model=None, highlight_fields=None,
                  display_field=None):
         self.model = model or self.get_model()
-        self.type_label = getattr(self, 'type_label', self.model._meta.module_name)
+        self.type_label = getattr(self, 'type_label', self.model._meta.model_name)
         self.serializer = self.get_serializer()
 
         self.display_field = getattr(self, 'display_field', display_field)
@@ -28,7 +28,7 @@ def __init__(self, es, index_name, model=None, highlight_fields=None,
         self.dummy_request = self.make_dummy_request()
 
     def __unicode__(self):
-        return self.model._meta.module_name
+        return self.model._meta.model_name
 
     def get_model(self):
         try:

editorsnotes/templates/admin/main/change_form.html

@@ -10,7 +10,7 @@
   </ul>
 {% endif %}{% endif %}
 {% endblock %}
-<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.module_name }}_form">{% csrf_token %}{% block form_top %}{% endblock %}
+<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.model_name }}_form">{% csrf_token %}{% block form_top %}{% endblock %}
 {% if request.GET.return_to %}
   <input type="hidden" name="_return_to" value="{{ request.GET.return_to }}" />
 {% endif %}