Mercurial Mercurial > iconolab / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use folder GUID instead of primary key.
authorAlexandre Segura <mex.zktk@gmail.com>
Fri, 14 Apr 2017 18:09:19 +0200
changeset 467 5d0879ffa7de
parent 466 4f6d30adf06a
child 468 0a7ea508098a
Use folder GUID instead of primary key.
src/iconolab/templates/iconolab/collection_home.html file | annotate | diff | comparison | revisions
src/iconolab/views/objects.py file | annotate | diff | comparison | revisions 
--- a/src/iconolab/templates/iconolab/collection_home.html	Fri Apr 14 17:54:24 2017 +0200
+++ b/src/iconolab/templates/iconolab/collection_home.html	Fri Apr 14 18:09:19 2017 +0200
@@ -21,12 +21,12 @@
         <ul class="list-unstyled">
         {% for folder in collection.folders.all %}
           <li>
-            {% if folder_id == folder.id %}
+            {% if folder_guid == folder.folder_guid|slugify %}
             <a href="{% url 'collection_home' collection_name %}">
               <i class="fa fa-close"></i> {{ folder.name }}
             </a>
             {% else %}
-            <a href="{% url 'collection_home' collection_name %}?folder={{ folder.id }}">
+            <a href="{% url 'collection_home' collection_name %}?folder={{ folder.folder_guid|slugify }}">
               <i class="fa fa-folder"></i> {{ folder.name }}
             </a>
             {% endif %}
--- a/src/iconolab/views/objects.py	Fri Apr 14 17:54:24 2017 +0200
+++ b/src/iconolab/views/objects.py	Fri Apr 14 18:09:19 2017 +0200
@@ -226,10 +226,9 @@
         folder = request.GET.get('folder', None)
 
         if folder is not None:
-            folder = int(folder)
-            items_list = items_list.filter(folders__id=folder)
+            items_list = items_list.filter(folders__folder_guid=folder)
 
-        context['folder_id'] = folder
+        context['folder_guid'] = folder
 
         context["items_pagination_data"] = self.get_pagination_data(
             items_list.all(),
iconolab