diff --git a/filer/admin/clipboardadmin.py b/filer/admin/clipboardadmin.py index aeaa26b85..d6ef70436 100644 --- a/filer/admin/clipboardadmin.py +++ b/filer/admin/clipboardadmin.py @@ -112,18 +112,15 @@ def ajax_upload(self, request, folder_id=None): clipboard_item = ClipboardItem(clipboard=clipboard, file=file) clipboard_item.save() except Exception, e: - #print e pass else: - pass#print uploadform.errors + pass except Exception, e: - #print e pass return render_to_response('admin/filer/tools/clipboard/clipboard_item_rows.html', {'items': file_items }, context_instance=RequestContext(request)) def move_file_to_clipboard(self, request): - #print "move file" if request.method == 'POST': file_id = request.POST.get("file_id", None) clipboard = tools.get_user_clipboard(request.user) diff --git a/filer/admin/fileadmin.py b/filer/admin/fileadmin.py index 3de5197d1..2bd6d9f9a 100644 --- a/filer/admin/fileadmin.py +++ b/filer/admin/fileadmin.py @@ -45,7 +45,6 @@ def response_change(self, request, obj): instead of the default change_list_view ''' r = super(FileAdmin, self).response_change(request, obj) - #print r['Location'] if r['Location']: # it was a successful save if r['Location'] in ['../']: diff --git a/filer/admin/folderadmin.py b/filer/admin/folderadmin.py index 69e8bf66d..97bd93cc7 100644 --- a/filer/admin/folderadmin.py +++ b/filer/admin/folderadmin.py @@ -64,8 +64,6 @@ def response_change(self, request, obj): ''' r = super(FolderAdmin, self).response_change(request, obj) if r['Location']: - #print r['Location'] - #print obj # it was a successful save if r['Location'] in ['../']: if obj.parent: @@ -204,20 +202,18 @@ def filter_file(qs, terms=[]): f.perms = userperms_for_request(f, request) if hasattr(f, 'has_read_permission'): if f.has_read_permission(request): - #print "%s has read permission for %s" % (request.user, f) folder_children.append(f) else: - pass#print "%s has NO read permission for %s" % (request.user, f) + pass else: folder_children.append(f) for f in file_qs: f.perms = userperms_for_request(f, request) if hasattr(f, 'has_read_permission'): if f.has_read_permission(request): - #print "%s has read permission for %s" % (request.user, f) folder_files.append(f) else: - pass#print "%s has NO read permission for %s" % (request.user, f) + pass else: folder_files.append(f) try: @@ -228,9 +224,7 @@ def filter_file(qs, terms=[]): } except: permissions = {} - #folder_children = folder_children.sort(cmp=lambda x,y: cmp(x.name.lower(), y.name.lower())) folder_files.sort(cmp=lambda x, y: cmp(x.label.lower(), y.label.lower())) - #import ipdb; ipdb.set_trace() items = folder_children + folder_files paginator = Paginator(items, FILER_PAGINATE_BY) diff --git a/filer/admin/permissions.py b/filer/admin/permissions.py index 3969cf484..8fc062348 100644 --- a/filer/admin/permissions.py +++ b/filer/admin/permissions.py @@ -10,10 +10,8 @@ def has_add_permission(self, request): def has_change_permission(self, request, obj=None): if hasattr(obj, 'has_edit_permission'): if obj.has_edit_permission(request): - #print "%s has edit permission for %s" % (request.user, obj) return True else: - #print "%s has NO edit permission for %s" % (request.user, obj) return False else: return True diff --git a/filer/fields/file.py b/filer/fields/file.py index f9b00c230..9579c2120 100644 --- a/filer/fields/file.py +++ b/filer/fields/file.py @@ -25,7 +25,7 @@ def render(self, name, value, attrs=None): file = File.objects.get(pk=value) related_url = file.logical_folder.get_admin_directory_listing_url_path() except Exception,e: - print e + pass if not related_url: related_url = reverse('admin:filer-directory_listing-root') params = self.url_parameters() diff --git a/filer/models/filemodels.py b/filer/models/filemodels.py index 7967d4c08..b112ffb52 100644 --- a/filer/models/filemodels.py +++ b/filer/models/filemodels.py @@ -109,7 +109,7 @@ def save(self, *args, **kwargs): try: self.generate_sha1() except Exception, e: - print e, type(3) + pass super(File, self).save(*args, **kwargs) @property @@ -153,16 +153,13 @@ def __unicode__(self): def subtype(self): - #print "get subtype" if not self._file_type_plugin_name: r = self else: try: r = getattr(self, self._file_type_plugin_name.lower()) except Exception, e: - #print e r = self - #print u"get subtype: %s %s" % (r, self._file_type_plugin_name) return r def get_admin_url_path(self): return urlresolvers.reverse('admin:filer_file_change', args=(self.id,)) diff --git a/filer/models/imagemodels.py b/filer/models/imagemodels.py index 08fd8e143..1c4f20ab4 100644 --- a/filer/models/imagemodels.py +++ b/filer/models/imagemodels.py @@ -4,7 +4,6 @@ from django.core import urlresolvers from django.db import models from django.utils.translation import ugettext_lazy as _ -from easy_thumbnails.files import Thumbnailer from filer import settings as filer_settings from filer.models.filemodels import File from filer.utils.filer_easy_thumbnails import FilerThumbnailer @@ -129,6 +128,7 @@ def icons(self): 'size':(int(size),int(size)), 'crop': True, 'upscale':True, + 'subject_location': self.subject_location, } thumb = self.file.get_thumbnail(thumbnail_options) _icons[size] = thumb.url @@ -143,6 +143,7 @@ def thumbnails(self): _thumbnails = {} for name, opts in Image.DEFAULT_THUMBNAILS.items(): try: + opts.update({'subject_location': self.subject_location}) thumb = self.file.get_thumbnail(opts) _thumbnails[name] = thumb.url except: diff --git a/filer/models/tools.py b/filer/models/tools.py index d27c2a193..6f29883c3 100644 --- a/filer/models/tools.py +++ b/filer/models/tools.py @@ -26,7 +26,6 @@ def move_files_from_clipboard_to_folder(clipboard, folder): def move_files_to_folder(files, folder): for file in files: - #print "moving %s (%s) to %s" % (file, type(file), folder) file.folder = folder file.save() return True diff --git a/filer/templates/admin/filer/folder/directory_table.html b/filer/templates/admin/filer/folder/directory_table.html index a0d898f59..41d3f42ce 100644 --- a/filer/templates/admin/filer/folder/directory_table.html +++ b/filer/templates/admin/filer/folder/directory_table.html @@ -37,7 +37,7 @@