Merge lp:~marenhachmann/inkscape-web/bug1389421 into lp:inkscape-web

[Hachmann]

In a gallery with 3 rows à 5 items, there are now always 15 boxes, even if one of them is the drop-site box for uploading a new item.

[Hachmann (marenhachmann)]

In the resources views file, there is one other occurance of the limit 15, but as far as I could follow it, that function never results in a drop-site being shown, so here an adaptation does not seem necessary to me. Hope I got that right. Can you confirm?

[Martin Owens (doctormo)]

So the reason this bug appeared was because I removed the limit modifier from the template and into the views as lists were included in other templates.

I'm not sure I like the verbose nature of this solution. A simpler way would be:

'limit' : 15 - gallery.is_editable(request.user),

Also don't forget to keep a comma at the end of each line in a dictionary, tuple or list. Line 23 in the diff shows you removed the comma from the breadcrumb entry, which is what you may do for C/C++ but python should allow for those to help with diff clarity.

I wasn't sure if the limit change should exist on both, and I certainly wasn't sure if the change should be in the view.py instead of the template (somehow) but I defer here because worrying about it excessively would be time consuming :-)

review: Needs Fixing

[lp:~marenhachmann/inkscape-web/bug1389421]

583. By Maren Hachmann <email address hidden> on 2014-11-10

Changed as proposed

584. By Maren Hachmann <email address hidden> on 2014-11-10

merged in current trunk

[Martin Owens (doctormo)]

There's no reason to have the limit setter outside of the dictionary braces now it's just one line.

[lp:~marenhachmann/inkscape-web/bug1389421]

585. By Maren Hachmann <email address hidden> on 2014-11-10

now limit is inside the braces

[Martin Owens (doctormo)]

Perfect! I love how small these fixes are :-)

review: Approve

=== modified file 'inkscape/resource/views.py'
--- inkscape/resource/views.py	2014-10-24 22:51:09 +0000
+++ inkscape/resource/views.py	2014-11-10 20:05:28 +0000
@@ -225,8 +225,9 @@
       'items'      : gallery.items.for_user(request.user),
       'gallery'    : gallery,
       'breadcrumbs': breadcrumbs(gallery.user, gallery),
-      'limit'      : 15,
+      'limit'      : 15 - gallery.is_editable(request.user),
     }
+    
     if gallery.group:
         c['breadcrumbs'] = breadcrumbs(gallery)
 
@@ -243,8 +244,9 @@
       'me': user == request.user,
       'items': user.galleries.for_user(request.user),
       'breadcrumbs': breadcrumbs(user, "Galleries"),
-      'limit': 15,
+      'limit'      : 15 - (user == request.user),
     }
+    
     return render_to_response('resource/user.html', c,
         context_instance=RequestContext(request))