From 34e40dda666f10d314d45d51837ccc2a0fb4663b Mon Sep 17 00:00:00 2001
From: Zambom <erikzambom@hotmail.com>
Date: Sat, 11 Feb 2017 21:24:49 -0200
Subject: [PATCH] Adjusting double resource page opening and changing link resource to always open in new window (model option)

---
 links/views.py                       |  4 ++++
 topics/templates/resources/list.html |  9 ++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/links/views.py b/links/views.py
index 4408e02..10fed9f 100644
--- a/links/views.py
+++ b/links/views.py
@@ -93,6 +93,8 @@ class CreateLinkView(LoginRequiredMixin, LogMixin, generic.edit.CreateView):
         if not self.object.topic.visible and not self.object.topic.repository:
             self.object.visible = False
 
+        self.object.show_window = True
+
         self.object.save()
 
         pend_form = pendencies_form.save(commit = False)
@@ -256,6 +258,8 @@ class UpdateLinkView(LoginRequiredMixin, LogMixin, generic.edit.UpdateView):
 
         if not self.object.topic.visible and not self.object.topic.repository:
             self.object.visible = False
+
+        self.object.show_window = True
         
         self.object.save()
 
diff --git a/topics/templates/resources/list.html b/topics/templates/resources/list.html
index d2de308..b8adb21 100644
--- a/topics/templates/resources/list.html
+++ b/topics/templates/resources/list.html
@@ -14,15 +14,10 @@
 		    	<input type="hidden" class="url_order" value="{% url 'topics:update_resource_order' %}" />
 
 	  			<h4 class="pull-left list-group-item-heading">
-	  			{% if resource|class_name == 'link' %}
-	  				 <a href="{{resource|resource_link}}" class="resource_link" target="_blank"> {{resource.name}}</a>
-	  			{% else %}
-	  				<a href="{% url resource.access_link resource.slug %}" class="resource_link" {% if resource.show_window %}target="_blank"{% endif %}>
+	  				<a data-href="{% url resource.access_link resource.slug %}" class="resource_link" {% if resource.show_window %}target="_blank"{% endif %}>
 
 						{{ resource.name }}
 	  				</a>
-	  			{% endif %}
-	  				
 				</h4>
 
 				{% if has_subject_permissions %}
@@ -66,7 +61,7 @@
 			upd = $(this).find('a.edit').is(e.target);
 		
 		if (!arrow && !menu && !del && !upd && !btn) {
-			var link = $(this).find('.resource_link').attr('href'),
+			var link = $(this).find('.resource_link').data('href'),
 				target = $(this).find('.resource_link').attr('target');
 
 			if (typeof(target) != 'undefined') {
--
libgit2 0.21.2