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

Cleaned up files, removed ununsed imports

Browse Source
This commit is contained in:
Roberto Rosario
2011-05-20 00:54:11 -04:00
parent 17c749a80a
commit 4a4afbf06a
22 changed files with 74 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/metadata/__init__.py
View File

@@ -1,10 +1,7 @@
from django.utils.translation import ugettext_lazy as _
from navigation.api import register_links, register_menu, \
register_model_list_columns, register_multi_item_links
from main.api import register_diagnostic, register_tool
from navigation.api import register_links, register_multi_item_links
from permissions.api import register_permissions
from documents.models import Document
PERMISSION_METADATA_DOCUMENT_EDIT = u'metadata_document_edit'

16
apps/metadata/api.py
View File

@@ -3,7 +3,6 @@
from urllib import unquote_plus
from django.shortcuts import get_object_or_404
from django.utils.translation import ugettext_lazy as _
from metadata.models import DocumentMetadata, MetadataType
@@ -39,21 +38,6 @@ def save_metadata_list(metadata_list, document, create=False):
for item in metadata_list:
save_metadata(item, document, create)
#if item['value']:
# save_metadata(item, document)
#else:
# #If there is no metadata value, delete the metadata entry
# #completely from the document
# try:
# metadata_type = MetadataType.objects.get(id=item['id'])
# document_metadata = DocumentMetadata.objects.get(
# document=document,
# metadata_type=metadata_type
# )
# document_metadata.delete()
# except ObjectDoesNotExist:
# pass
def save_metadata(metadata_dict, document, create=False):
"""save metadata_dict"""

6
apps/metadata/forms.py
View File

@@ -4,9 +4,9 @@ from django.forms.formsets import formset_factory
from metadata.conf.settings import AVAILABLE_MODELS
from metadata.conf.settings import AVAILABLE_FUNCTIONS
from metadata.models import MetadataType, DocumentMetadata
from metadata.models import MetadataType
class MetadataForm(forms.Form):
def __init__(self, *args, **kwargs):
super(MetadataForm, self).__init__(*args, **kwargs)
@@ -63,5 +63,5 @@ class AddMetadataForm(forms.Form):
class MetadataRemoveForm(MetadataForm):
update = forms.BooleanField(initial=False, label=_(u'Remove'), required=False)
MetadataRemoveFormSet = formset_factory(MetadataRemoveForm, extra=0)

21
apps/metadata/views.py
View File

@@ -25,7 +25,7 @@ def metadata_edit(request, document_id=None, document_id_list=None):
documents = [get_object_or_404(Document, pk=document_id)]
if documents[0].documentmetadata_set.count() == 0:
messages.warning(request, _(u'The selected document doesn\'t have any metadata.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
elif document_id_list:
documents = [get_object_or_404(Document, pk=document_id) for document_id in document_id_list.split(',')]
else:
@@ -60,8 +60,8 @@ def metadata_edit(request, document_id=None, document_id_list=None):
warnings = delete_indexes(document)
if request.user.is_staff or request.user.is_superuser:
for warning in warnings:
messages.warning(request, _(u'Error deleting document indexes; %s') % warning)
messages.warning(request, _(u'Error deleting document indexes; %s') % warning)
errors = []
for form in formset.forms:
if form.cleaned_data['update']:
@@ -80,7 +80,7 @@ def metadata_edit(request, document_id=None, document_id_list=None):
warnings = update_indexes(document)
if warnings and (request.user.is_staff or request.user.is_superuser):
for warning in warnings:
messages.warning(request, _(u'Error updating document indexes; %s') % warning)
messages.warning(request, _(u'Error updating document indexes; %s') % warning)
else:
messages.success(request, _(u'Document indexes updated successfully.'))
@@ -118,7 +118,6 @@ def metadata_add(request, document_id=None, document_id_list=None):
messages.error(request, _(u'Must provide at least one document.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
metadata = {}
for document in documents:
RecentDocument.objects.add_document_for_user(request.user, document)
@@ -142,7 +141,7 @@ def metadata_add(request, document_id=None, document_id_list=None):
else:
form = AddMetadataForm()
context = {
#'form_display_mode_table': True,
'form': form,
@@ -169,7 +168,7 @@ def metadata_remove(request, document_id=None, document_id_list=None):
if documents[0].documentmetadata_set.count() == 0:
messages.warning(request, _(u'The selected document doesn\'t have any metadata.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
elif document_id_list:
documents = [get_object_or_404(Document, pk=document_id) for document_id in document_id_list.split(',')]
else:
@@ -204,8 +203,8 @@ def metadata_remove(request, document_id=None, document_id_list=None):
warnings = delete_indexes(document)
if request.user.is_staff or request.user.is_superuser:
for warning in warnings:
messages.warning(request, _(u'Error deleting document indexes; %s') % warning)
messages.warning(request, _(u'Error deleting document indexes; %s') % warning)
for form in formset.forms:
if form.cleaned_data['update']:
metadata_type = get_object_or_404(MetadataType, pk=form.cleaned_data['id'])
@@ -221,7 +220,7 @@ def metadata_remove(request, document_id=None, document_id_list=None):
warnings = update_indexes(document)
if warnings and (request.user.is_staff or request.user.is_superuser):
for warning in warnings:
messages.warning(request, _(u'Error updating document indexes; %s') % warning)
messages.warning(request, _(u'Error updating document indexes; %s') % warning)
else:
messages.success(request, _(u'Document indexes updated successfully.'))
@@ -229,7 +228,7 @@ def metadata_remove(request, document_id=None, document_id_list=None):
return HttpResponseRedirect(document.get_absolute_url())
elif len(documents) > 1:
return HttpResponseRedirect(reverse('document_list_recent'))
context = {
'form_display_mode_table': True,
'form': formset,