From 5230a8e0a06a5d67d6c13f2359bc51be07b4fb5a Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Fri, 9 Sep 2016 00:41:57 +0200
Subject: Shortcut menu: menu is now dynamic - selected items filter dependant
 items (refs #2996) - can now pin items from sheet (refs #3078)

---
 ishtar_common/urls.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'ishtar_common/urls.py')

diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py
index a6f24beed..802e6ca0d 100644
--- a/ishtar_common/urls.py
+++ b/ishtar_common/urls.py
@@ -34,6 +34,7 @@ urlpatterns = patterns(
     # internationalization
     url(r'^i18n/', include('django.conf.urls.i18n')),
     # General
+    url(r'shortcut_menu/', views.shortcut_menu, name='shortcut-menu'),
     url(r'person_search/(?P<step>.+)?$',
         check_rights(['add_person'])(
             views.person_search_wizard), name='person_search'),
@@ -129,6 +130,8 @@ urlpatterns += patterns(
         name='dashboard-main-detail'),
     url(r'update-current-item/$', 'update_current_item',
         name='update-current-item'),
+    url(r'pin/(?P<item_type>[a-z-]+)/(?P<pk>\d+)/$', 'update_current_item',
+        name='pin'),
     url(r'new-person/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$',
         'new_person', name='new-person'),
     url(r'new-person-noorga/'
-- 
cgit v1.2.3


From 2a0b5e96a92202c9e16991584bb67e0c97e03edc Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Fri, 9 Sep 2016 16:42:37 +0200
Subject: Unpin item.

---
 ishtar_common/templates/ishtar/blocks/shortcut_menu.html |  3 +++
 ishtar_common/urls.py                                    |  1 +
 ishtar_common/views.py                                   | 14 ++++++++++++++
 3 files changed, 18 insertions(+)

(limited to 'ishtar_common/urls.py')

diff --git a/ishtar_common/templates/ishtar/blocks/shortcut_menu.html b/ishtar_common/templates/ishtar/blocks/shortcut_menu.html
index 29c975e79..c1100ae01 100644
--- a/ishtar_common/templates/ishtar/blocks/shortcut_menu.html
+++ b/ishtar_common/templates/ishtar/blocks/shortcut_menu.html
@@ -15,6 +15,9 @@
       {% endfor %}</select>
     </td>{% with 'show-'|add:model_name as model_url%}
     <td><a href='#' onclick='load_current_window("{% url model_url 0 %}", "{{model_name}}");' class='display_details'><i class="fa fa-info-circle" aria-hidden="true"></i></a></td>
+    <td><span class='pin-action' onclick='$.get("{% url 'unpin' model_name %}", function(){load_shortcut_menu();});' title="{% trans 'Unpin' %}">
+            <i class="fa fa-times"></i>
+    </span></td>
     {% endwith %}
 </tr>
 {% endfor %}
diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py
index 802e6ca0d..049bcaf7b 100644
--- a/ishtar_common/urls.py
+++ b/ishtar_common/urls.py
@@ -132,6 +132,7 @@ urlpatterns += patterns(
         name='update-current-item'),
     url(r'pin/(?P<item_type>[a-z-]+)/(?P<pk>\d+)/$', 'update_current_item',
         name='pin'),
+    url(r'unpin/(?P<item_type>[a-z-]+)/$', 'unpin', name='unpin'),
     url(r'new-person/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$',
         'new_person', name='new-person'),
     url(r'new-person-noorga/'
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 95c4dbd76..50c647372 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -267,6 +267,20 @@ def get_current_items(request):
     return currents
 
 
+def unpin(request, item_type):
+    request.session['find'] = ''
+    if item_type == 'find':
+        return HttpResponse('ok')
+    request.session['contextrecord'] = ''
+    if item_type == 'contextrecord':
+        return HttpResponse('ok')
+    request.session['operation'] = ''
+    if item_type == 'operation':
+        return HttpResponse('ok')
+    request.session['file'] = ''
+    return HttpResponse('ok')
+
+
 def update_current_item(request, item_type=None, pk=None):
     if not item_type or not pk:
         if not request.is_ajax() and not request.method == 'POST':
-- 
cgit v1.2.3