matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use more consistent names

Browse Source
This commit is contained in:
Roberto Rosario
2014-10-14 04:12:25 -04:00
parent bc13129e3b
commit 2f3d62feac
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mayan/apps/document_indexing/models.py
View File

@@ -24,7 +24,7 @@ class Index(models.Model):
@property @property
def template_root(self): def template_root(self):
return self.template_nodes.get(parent=None) return self.node_templates.get(parent=None)
@property @property
def instance_root(self): def instance_root(self):
@@ -59,7 +59,7 @@ class Index(models.Model):
@property @property
def node_instances(self): def node_instances(self):
return [template_node.node_instance.get() for template_node in self.template_nodes.all()] return [template_node.node_instance.get() for template_node in self.node_templates.all()]
class Meta: class Meta:
verbose_name = _(u'Index') verbose_name = _(u'Index')
@@ -68,7 +68,7 @@ class Index(models.Model):
class IndexTemplateNode(MPTTModel): class IndexTemplateNode(MPTTModel):
parent = TreeForeignKey('self', null=True, blank=True) parent = TreeForeignKey('self', null=True, blank=True)
index = models.ForeignKey(Index, verbose_name=_(u'Index'), related_name='template_nodes') index = models.ForeignKey(Index, verbose_name=_(u'Index'), related_name='node_templates')
expression = models.CharField(max_length=128, verbose_name=_(u'Indexing expression'), help_text=_(u'Enter a python string expression to be evaluated.')) expression = models.CharField(max_length=128, verbose_name=_(u'Indexing expression'), help_text=_(u'Enter a python string expression to be evaluated.'))
# % available_indexing_functions_string) # % available_indexing_functions_string)
enabled = models.BooleanField(default=True, verbose_name=_(u'Enabled'), help_text=_(u'Causes this node to be visible and updated when document data changes.')) enabled = models.BooleanField(default=True, verbose_name=_(u'Enabled'), help_text=_(u'Causes this node to be visible and updated when document data changes.'))
@@ -86,7 +86,7 @@ class IndexInstanceNode(MPTTModel):
parent = TreeForeignKey('self', null=True, blank=True) parent = TreeForeignKey('self', null=True, blank=True)
index_template_node = models.ForeignKey(IndexTemplateNode, related_name='node_instance', verbose_name=_(u'Index template node')) index_template_node = models.ForeignKey(IndexTemplateNode, related_name='node_instance', verbose_name=_(u'Index template node'))
value = models.CharField(max_length=128, blank=True, verbose_name=_(u'Value')) value = models.CharField(max_length=128, blank=True, verbose_name=_(u'Value'))
documents = models.ManyToManyField(Document, related_name='index_instance_nodes', verbose_name=_(u'Documents')) documents = models.ManyToManyField(Document, related_name='node_instances', verbose_name=_(u'Documents'))
def __unicode__(self): def __unicode__(self):
return self.value return self.value

2
mayan/apps/document_indexing/serializers.py
View File

@@ -20,7 +20,7 @@ class IndexTemplateNodeSerializer(serializers.ModelSerializer):
class IndexSerializer(serializers.ModelSerializer): class IndexSerializer(serializers.ModelSerializer):
template_nodes = IndexTemplateNodeSerializer(read_only=True, many=True) node_templates = IndexTemplateNodeSerializer(read_only=True, many=True)
node_instances = IndexInstanceNodeSerializer(read_only=True, many=True) node_instances = IndexInstanceNodeSerializer(read_only=True, many=True)
class Meta: class Meta:

2
mayan/apps/document_indexing/views.py
View File

@@ -410,7 +410,7 @@ def document_index_list(request, document_id):
document = get_object_or_404(Document, pk=document_id) document = get_object_or_404(Document, pk=document_id)
object_list = [] object_list = []
queryset = document.indexinstancenode_set.all() queryset = document.node_instances.all()
try: try:
# TODO: should be AND not OR # TODO: should be AND not OR
Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_VIEW, PERMISSION_DOCUMENT_INDEXING_VIEW]) Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_VIEW, PERMISSION_DOCUMENT_INDEXING_VIEW])