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

Old remaked and unused code removal

Browse Source
This commit is contained in:
Roberto Rosario
2014-07-25 21:27:30 -04:00
parent e9717d9bdd
commit 2c33e2e029
4 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mayan/apps/documents/admin.py
View File

@@ -20,9 +20,6 @@ class DocumentVersionInline(admin.StackedInline):
extra = 1 extra = 1
classes = ('collapse-open',) classes = ('collapse-open',)
allow_add = True allow_add = True
# inlines = [
# DocumentPageInline,
# ]
class DocumentTypeFilenameInline(admin.StackedInline): class DocumentTypeFilenameInline(admin.StackedInline):

4
mayan/apps/metadata/forms.py
View File

@@ -17,7 +17,6 @@ class MetadataForm(forms.Form):
# Set form fields initial values # Set form fields initial values
if 'initial' in kwargs: if 'initial' in kwargs:
self.metadata_type = kwargs['initial'].pop('metadata_type', None) self.metadata_type = kwargs['initial'].pop('metadata_type', None)
# self.document_type = kwargs['initial'].pop('document_type', None)
# FIXME: # FIXME:
# required = self.document_type.documenttypemetadatatype_set.get(metadata_type=self.metadata_type).required # required = self.document_type.documenttypemetadatatype_set.get(metadata_type=self.metadata_type).required
@@ -71,7 +70,6 @@ class MetadataRemoveForm(MetadataForm):
class MetadataSelectionForm(forms.Form): class MetadataSelectionForm(forms.Form):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
# document_type = kwargs.pop('document_type', None)
super(MetadataSelectionForm, self).__init__(*args, **kwargs) super(MetadataSelectionForm, self).__init__(*args, **kwargs)
document_type = getattr(self, 'initial', {}).get('document_type', None) document_type = getattr(self, 'initial', {}).get('document_type', None)
if document_type: if document_type:
@@ -86,7 +84,6 @@ class MetadataSelectionForm(forms.Form):
queryset=MetadataSet.objects.all(), queryset=MetadataSet.objects.all(),
label=_(u'Metadata sets'), label=_(u'Metadata sets'),
required=False, required=False,
# widget=forms.widgets.SelectMultiple(attrs={'size': 10, 'class': 'choice_form'})
widget=ScrollableCheckboxSelectMultiple(attrs={'size': 10, 'class': 'choice_form'}) widget=ScrollableCheckboxSelectMultiple(attrs={'size': 10, 'class': 'choice_form'})
) )
@@ -94,7 +91,6 @@ class MetadataSelectionForm(forms.Form):
queryset=MetadataType.objects.all(), queryset=MetadataType.objects.all(),
label=_(u'Metadata'), label=_(u'Metadata'),
required=False, required=False,
# widget=forms.widgets.SelectMultiple(attrs={'size': 10, 'class': 'choice_form'})
widget=ScrollableCheckboxSelectMultiple(attrs={'size': 10, 'class': 'choice_form'}) widget=ScrollableCheckboxSelectMultiple(attrs={'size': 10, 'class': 'choice_form'})
) )

6
mayan/apps/permissions/views.py
View File

@@ -115,7 +115,6 @@ def permission_grant(request):
items = [] items = []
for item_properties in items_property_list: for item_properties in items_property_list:
# permission = get_object_or_404(Permission, pk=item_properties['permission_id'])
try: try:
permission = Permission.objects.get({'pk': item_properties['permission_id']}) permission = Permission.objects.get({'pk': item_properties['permission_id']})
except Permission.DoesNotExist: except Permission.DoesNotExist:
@@ -178,7 +177,6 @@ def permission_revoke(request):
items = [] items = []
for item_properties in items_property_list: for item_properties in items_property_list:
# permission = get_object_or_404(Permission, pk=item_properties['permission_id'])
try: try:
permission = Permission.objects.get({'pk': item_properties['permission_id']}) permission = Permission.objects.get({'pk': item_properties['permission_id']})
except Permission.DoesNotExist: except Permission.DoesNotExist:
@@ -286,8 +284,6 @@ def get_non_role_members(role):
if anonymous: if anonymous:
non_members.append((_(u'Special'), _as_choice_list(list(anonymous)))) non_members.append((_(u'Special'), _as_choice_list(list(anonymous))))
# non_holder_list.append((_(u'Special'), _as_choice_list([AnonymousUserSingleton.objects.get()])))
return non_members return non_members
@@ -307,9 +303,7 @@ def role_members(request, role_id):
return assign_remove( return assign_remove(
request, request,
# left_list=lambda: generate_choices_w_labels(get_non_role_members(role)),
left_list=lambda: get_non_role_members(role), left_list=lambda: get_non_role_members(role),
# right_list=lambda: generate_choices_w_labels(get_role_members(role)),
right_list=lambda: get_role_members(role), right_list=lambda: get_role_members(role),
add_method=lambda x: add_role_member(role, x), add_method=lambda x: add_role_member(role, x),
remove_method=lambda x: remove_role_member(role, x), remove_method=lambda x: remove_role_member(role, x),

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

@@ -112,12 +112,7 @@ class BaseModel(models.Model):
if not new_version_data: if not new_version_data:
new_version_data = {} new_version_data = {}
try: new_version = document.new_version(file=file_object, user=user, **new_version_data)
new_version = document.new_version(file=file_object, user=user, **new_version_data)
except Exception:
# Don't leave the database in a broken state
# document.delete()
raise
if filename: if filename:
document.rename(filename) document.rename(filename)
@@ -268,7 +263,6 @@ class SourceTransformation(models.Model):
transformations = SourceTransformationManager() transformations = SourceTransformationManager()
def __unicode__(self): def __unicode__(self):
# return u'"%s" for %s' % (self.get_transformation_display(), unicode(self.content_object))
return self.get_transformation_display() return self.get_transformation_display()
class Meta: class Meta: