dev merge

ailsoncgt
2 parents 745e5f6c a7e9e5ba
Showing 15 changed files with 229 additions and 80 deletions Show diff stats
courses/templates/subject/form_view_teacher.html
courses/templates/topic/link_topic_list.html
courses/templates/topic/link_topic_list_edit.html
forum/static/js/forum.js
links/admin.py
links/forms.py
links/static/css/link.css
links/static/js/links.js
links/templates/links/create_link.html
links/templates/links/delete_link.html
links/templates/links/render_link.html
links/templates/links/update_link.html
links/tests.py
links/urls.py
links/views.py
@@ -4,7 +4,7 @@
    <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
    <script src="{% static 'js/file.js' %}"></script>
    <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
-   <script type = "text/javascript" src="{% static 'links.js' %}"></script>
+   <script type = "text/javascript" src="{% static 'js/links.js' %}"></script>
 {% endblock %}
 <div class="panel panel-default cards-detail">
   <div class="panel-heading topic">
@@ -39,7 +39,7 @@
       </div><!--column-->
     </div><!--row-->
   </div>
-  <div class="panel-collapse collapseTopic-{{topic.slug}} collapse in" role="tabpanel" aria-labelledby="heading_{{topic.id}}" aria-expanded="true" aria-hidden="false">
+  <div class="panel-collapse collapseTopic-{{topic.slug}} topic_{{ topic.id }} collapse in" role="tabpanel" aria-labelledby="heading_{{topic.id}}" aria-expanded="true" aria-hidden="false">
     <div class="panel-body">
       <div class="presentation" id="presentation_{{topic.slug}}">
         <p>
@@ -86,7 +86,7 @@
           </div>
         </div>
       </div><!--EndPresentation-->
-      <div class="editation" id="editation_{{topic.slug}}">
+      <div class="editation topic_{{ topic.id }}" id="editation_{{topic.slug}}">
         <div class="form-group">
           <label class="control-label" for="focusedInput2">{% trans 'Name Topic' %}</label>
           <input type="text" class="form-control" value="{{topic}}">
@@ -140,11 +140,7 @@
           </div>
         </div>
       </div><!--EndEditation-->
-      {% professor_subject topic.subject user as professor_links %}
-        {% if professor_links%}
-            {% include "links/create_link.html" %}
-            {% include "links/delete_link.html" %}
-        {% endif %}
+
     </div>
   </div>
 </div>
@@ -287,10 +283,7 @@
 <!--EndModal-->
 <!-- MODAL LINK EDIT-->
-{% professor_subject topic.subject user as links_update %}
-{% if links_update%}
-    {% include "links/update_link.html" %}
-{% endif %}
+
 <!-- EndModal -->
@@ -313,5 +306,3 @@
         </div>
     </div>
 </div>
-
-
 {% load static i18n list_topic_foruns permission_tags %}
 <div id="list-topic{{ topic.id }}-links">
 {% for link in links%}
-        <li><i class="fa fa-link" aria-hidden="true"></i>  <a href="javascript:get_modal_link('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#divModalLink')">{{link}}</a></li>
+        <li id = "link_{{ link.slug }}"><i class="fa fa-link" aria-hidden="true"></i>  <a href="javascript:get_modal_link('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#divModalLink')">{{link.name}}</a></li>
 {% endfor %}
 </div>
 <div class = 'row' id ="divModalLink">
@@ -2,8 +2,12 @@
 <div id="list-topic{{ topic.id }}-links-edit">
 {% for link in links%}
-        <li class="icon_edit_remove"> <a href="#" data-toggle="modal" data-target="#linksModalEdit"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></a>  <a href="#" data-toggle="modal" data-target="#removeLink"><i class="fa fa-trash fa-lg" aria-hidden="true"></i></a></li>
-        <li><i class="fa fa-link" aria-hidden="true"></i>  <a href="javascript:get_modal_link('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#divModalLink')">{{link}}</a></li>
+        <li class="icon_edit_remove" id = "link_edit_icon_{{ link.slug }}"> <a href="javascript:get_modal_link('{% url 'course:links:update_link' link.slug %}', '#linksModalEdit', '#divModalLinkUpdate')"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></a>  <a href="javascript:get_modal_link('{% url 'course:links:delete_link' link.slug %}', '#linkDeleteModal', '#divModalLinkUpdate')"><i class="fa fa-trash fa-lg" aria-hidden="true"></i></a></li>
+        <li id="link_edit_{{ link.slug }}"><i class="fa fa-link" aria-hidden="true"></i>  <a href="javascript:get_modal_link('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#divModalLink')">{{link.name}}</a></li>
 {% endfor %}
 </div>
+
+<div class="row" id="divModalLinkUpdate">
+
+</div>
@@ -47,7 +47,7 @@ function createForum(url, topic) {
             $(".forum_form").html(data);
             $("#id_topic").val(topic);
-            setForumCreateFormSubmit();
+            setForumCreateFormSubmit(topic);
         }
     });
@@ -59,7 +59,7 @@ function createForum(url, topic) {
 * Function to set the forum's create form submit function
 *
 */
-function setForumCreateFormSubmit() {
+function setForumCreateFormSubmit(topic) {
     $('.date-picker').datepicker({
         language: locale,
     });
@@ -72,13 +72,13 @@ function setForumCreateFormSubmit() {
             data: frm.serialize(),
             dataType: "json",
             success: function (data) {
-                $('.foruns_list').append("<li><i class='fa fa-commenting' aria-hidden='true'></i> <a id='forum_"+data.forum_id+"' href='"+data.url+"'> "+data.name+"</a></li>");
+                $(".topic_" + topic).find('.foruns_list').append("<li><i class='fa fa-commenting' aria-hidden='true'></i> <a id='forum_"+data.forum_id+"' href='"+data.url+"'> "+data.name+"</a></li>");
                 $("#createForum").modal('hide');
             },
             error: function(data) {
                 $(".forum_form").html(data.responseText);
-                setForumCreateFormSubmit();
+                setForumCreateFormSubmit(topic);
             }
         });
         return false;
@@ -3,8 +3,8 @@ from django.contrib import admin
 from .models import Link
 class LinkAdmin(admin.ModelAdmin):
-	list_display = ['name', 'link_url','link_description']
-	search_fields = ['name', 'link_url','link_description']
+	list_display = ['name', 'slug','link_url','link_description']
+	search_fields = ['name','slug' ,'link_url','link_description']
 admin.site.register(Link, LinkAdmin)
@@ -21,6 +21,15 @@ class CreateLinkForm(forms.ModelForm):
         fields = ['name','link_url','link_description']
 class UpdateLinkForm(forms.ModelForm):
+    def clean_link_url(self):
+        link_url = self.cleaned_data['link_url']
+        try:
+            resposta = requests.head(link_url)
+            if resposta.status_code >= 400:
+                raise forms.ValidationError(_('Invalid url!'))
+        except requests.ConnectionError:
+            raise forms.ValidationError(_('Invalid url!'))
+        return link_url
     class Meta:
         model = Link
         fields = ['name','link_url','link_description']
@@ -0,0 +1,3 @@
+.modal-backdrop{
+	z-index: 0;
+}
 \ No newline at end of file
@@ -0,0 +1,8 @@
+function get_modal_link(url, id,div_content){
+    $.get(url, function (data) {
+        $(div_content).empty();
+        $(div_content).append(data);
+        $(id).modal('show');
+    });
+
+}
@@ -13,6 +13,7 @@
         <form method="post" action="" id="form-link" enctype="multipart/form-data">
           {% csrf_token %}
         {% for field in form %}
+            <div class ="form-group">
             {% if field.field.required %}
               <label for="{{ field.auto_id }}">{{ field.label }}<span>*</span></label>
             {% endif %}
@@ -29,9 +30,10 @@
                     </ul>
                 </div>
             {% endif %}
+          </div>
         {% endfor %}
         <div class="form-group">
-          <a href="javascript:void(0)" class="btn btn-raised btn-default" data-dismiss="modal">{% trans 'Cancel' %}</a>
+          <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Cancel" %}</button>
           <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
         </div>
         <!-- .end Card -->
@@ -41,7 +43,7 @@
 </div>
 <!-- EndModal -->
 {% block script_link %}
-    {# // <script src="{% static '/links.js' %}"></script> #}
+    {# // <script src="{% static 'js/links.js' %}"></script> #}
     <script type="text/javascript">
       $("#form-link").submit(function(event) {
             var data = new FormData($('#form-link').get(0));
-{% load widget_tweaks i18n %}
-<!-- MODAL REMOVE LINK -->
-<div class="modal" id="removeLink">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">X</button>
-        <h4 class="modal-title"></h4>
-      </div>
-      <div class="modal-body">
-        <p>{% trans 'Do you really want to delete this link?' %}</p>
-      </div>
-      <div class="modal-footer">
-        <!--  -->
-        <button type="button" class="btn btn-primary btn-default" data-dismiss="modal">{% trans 'Cancel' %}</button>
-        <a href="http://www.google.com" target="_self"><button type="button" class="btn btn-primary" data-dismiss="modal" aria-hidden="true">{% trans 'Confirm' %}</button></a>
+{% load static widget_tweaks i18n %}
-      </div>
+<!-- MODAL DELETE LINK -->
+<link rel="stylesheet" type="text/css" href="{% static 'css/link.css' %}">
+
+<div class="erro-update">
+    <div class="modal fade" id="linkDeleteModal" tabindex="-1" role="dialog" aria-labelledby="deleteLinkLabel" style="z-index: 10">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+                    <h4 class="modal-title" id="deleteLinkLabel">{% trans 'Delete Link' %}</h4>
+                </div>
+                <div class="modal-body">
+                <!-- Card -->
+                    <form class="form-horizontal" method="post" id="form-delete-link" enctype="multipart/form-data">
+                    {% csrf_token %}
+                        <fieldset>
+                            <div class="col-md-12">
+                                {% trans "Are you sure to delete the link " %} <strong>"{{ link.name }}"</strong> </a> of {{ link.topic.name }}?
+                            </div>
+                            <div class="form-group">
+                                <div class="col-md-12">
+                                     <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
+                                    <button class="btn btn-raised btn-primary" type="submit">{% trans 'Delete' %}</button>
+                                </div>
+                            </div>
+                        </fieldset>
+                    </form>
+                <!-- .end Card -->
+              </div>
+            </div>
+        </div>
     </div>
-  </div>
 </div>
-<!-- END -->
+
+{% block script_link %}
+
+    {# // <script src="{% static 'js/link.js' %}"></script> #}
+    <script type="text/javascript">
+      $("#form-delete-link").submit(function(event) {
+            var data = new FormData($('#form-delete-link').get(0));
+            $.ajax({
+                url: "{% url 'course:links:delete_link' link.slug %}",
+                type: $("#form-delete-link").attr('method'),
+                data: data,
+                cache: false,
+                processData: false,
+                contentType: false,
+                success: function(data) {
+                    $('#linkDeleteModal').modal('hide');
+                    $('#link_{{ link.slug }}').remove();
+                    $('#link_edit_icon_{{ link.slug }}').remove();
+                    $('#link_edit_{{ link.slug }}').remove();
+                    alertify.alert('Link successfully deleted!')
+                },
+                error: function(data){
+                    // $('.erro-update').html(data.responseText);
+                    $('.modal-backdrop').remove();
+                    $('#linkDeteleModal').modal();
+                    alertify.alert('Error when trying to delete.');
+                }
+            });
+            event.preventDefault();
+          });
+  </script>
+{% endblock script_link %}
+<!-- EndModal -->
-<li><i class="fa fa-link" aria-hidden="true"></i>  <a href="javascript:get_modal_link('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#divModalLink')">{{link}}</a></li>
+<li id="link_{{ link.slug }}"><i class="fa fa-link" aria-hidden="true"></i>  <a href="javascript:get_modal_link('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#divModalLink')">{{link.name}}</a></li>
@@ -5,29 +5,73 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
-        <h4 class="modal-title" id="myModalLabel">{% trans 'Links' %}</h4>
+        <h4 class="modal-title" id="myModalLabel">{% trans 'Edit Link' %}</h4>
       </div>
       <div class="modal-body">
         <!-- Card -->
+        <form class="form-horizontal" method="post" id="form-update-link" enctype="multipart/form-data">
+        {% csrf_token %}
+        {% for field in form %}
+            <div class="form-group is-empty">
+                <div class="col-md-12">
+                    {% if field.field.required %}
+                        <label for="{{ field.auto_id }}" class="control-label">{{ field.label }}<span>*</span></label>
+                    {% else %}
+                        <label for="{{ field.auto_id }}" class=" control-label">{{ field.label }}</label>
+                    {% endif %}
+                    {% render_field field class='form-control input-sm' %}
+                  </div>
+            </div>
+            {% if field.errors %}
+                <div class="alert alert-danger alert-dismissible clearfix" role="alert">
+                    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                    <ul>
+                        {% for error in field.errors %}
+                            <li>{{ error }}</li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            {% endif %}
+        {% endfor %}
         <div class="form-group">
-          <label class="control-label" for="inputDefault">{% trans 'Name' %}</label>
-          <input value="Python" type="text" class="form-control" id="inputDefault">
+          <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Cancel" %}</button>
+          <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
         </div>
-        <div class="form-group">
-          <label class="control-label" for="inputDefault">{% trans 'URL' %}</label>
-          <input value="https://www.python.org/" type="text" class="form-control" id="inputDefault">
-        </div>
-        <div class="form-group is-empty">
-          <label class="control-label" for="inputDefault">{% trans 'Description' %}</label>
-          <textarea class="form-control" rows="3"></textarea>
-        </div>
-        <div class="form-group">
-          <a href="javascript:void(0)" class="btn btn-raised btn-default" data-dismiss="modal">{% trans 'Cancel' %}</a>
-          <a href="javascript:void(0)" class="btn btn-raised btn-primary">{% trans 'Submit' %}</a>
-      </div>
         <!-- .end Card -->
       </div>
     </div>
   </div>
 </div>
 <!-- EndModal -->
+{% block script_link %}
+
+    {# // <script src="{% static 'js/links.js' %}"></script> #}
+    <script type="text/javascript">
+      $("#form-update-link").submit(function(event) {
+            var data = new FormData($('#form-update-link').get(0));
+            $.ajax({
+                url: "{% url 'course:links:update_link' link.slug %}",
+                type: $("#form-update-link").attr('method'),
+                data: data,
+                cache: false,
+                processData: false,
+                contentType: false,
+                success: function(data) {
+                    $('#linksModalEdit').modal('hide');
+                    $('#link_edit_{{ link.slug }}').replaceWith(data);
+                    $('#link_{{ link.slug }}').replaceWith(data);
+                    alertify.alert("Sucessfully Updated!")
+                },
+                error: function(data){
+                    $('.erro-update').html(data.responseText);
+                    $('.modal-backdrop').remove();
+                    $('#linksModalEdit').modal();
+                    alertify.alert('Invalid link, insert a valid one!');
+                }
+            });
+            event.preventDefault();
+          });
+  </script>
+{% endblock script_link %}
@@ -154,7 +154,9 @@ class LinkTestCase(TestCase):
          url = reverse('course:links:update_link',kwargs={'slug': self.link.slug})
          print("slug",self.link.slug)
          data = {
+            "name" : 'testinglink',
             "link_description":'new description',
+            "link_url" : 'teste.com',
          }
          self.assertEqual(Link.objects.all()[0].link_description, "testdescription") # old description
          response = self.client.post(url, data)
@@ -3,8 +3,8 @@ from . import views
 urlpatterns = [
     url(r'^create_link/(?P<slug>[\w_-]+)/$', views.CreateLink.as_view(), name='create_link'),
-    url(r'^deletelink/(?P<linkname>[\w_-]+)/$', views.deleteLink,name = 'delete_link'),
-	url(r'^updatelink/(?P<slug>[\w_-]+)/$', views.UpdateLink.as_view(),name = 'update_link'),
-    url(r'^render-link/(?P<id>[0-9]+)/$', views.render_link, name='render_link'),
+    url(r'^delete_link/(?P<slug>[\w_-]+)/$', views.DeleteLink.as_view(),name = 'delete_link'),
+	url(r'^update_link/(?P<slug>[\w_-]+)/$', views.UpdateLink.as_view(),name = 'update_link'),
+    url(r'^render-link/(?P<slug>[\w_-]+)/$', views.render_link, name='render_link'),
     url(r'^view_link/(?P<slug>[\w_-]+)/$',views.ViewLink.as_view(),name = 'view_link')
 ]
@@ -9,7 +9,7 @@ from rolepermissions.mixins import HasRoleMixin
 from core.mixins import NotificationMixin
 from django.urls import reverse
 from django.core.files.base import ContentFile
-
+from rolepermissions.verifications import has_role
 from .image_crawler import *
 from courses.models import Topic
@@ -62,20 +62,37 @@ class CreateLink(LoginRequiredMixin, HasRoleMixin, NotificationMixin, generic.Cr
         context["topic"] = topic
         return context
     def get_success_url(self):
-        self.success_url = redirect('course:links:render_link', id = self.object.id)
+        self.success_url = redirect('course:links:render_link', slug = self.object.slug)
         return self.success_url
-def deleteLink(request,linkname):
-    link = get_object_or_404(Link,name = linkname)
-    link.delete()
-    template_name = 'links/delete_link.html'
-    messages.success(request,_("Link deleted Successfully!"))
-    return redirect('course:manage')
+class DeleteLink(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
+	allowed_roles = ['professor', 'system_admin']
+	login_url = reverse_lazy("core:home")
+	redirect_field_name = 'next'
+	model = Link
+	template_name = 'links/delete_link.html'
+
+	def dispatch(self, *args, **kwargs):
+		link = get_object_or_404(Link, slug = self.kwargs.get('slug'))
+		if(not (link.topic.owner == self.request.user) and not(has_role(self.request.user, 'system_admin')) ):
+			return self.handle_no_permission()
+		return super(DeleteLink, self).dispatch(*args, **kwargs)
+
+	def get_context_data(self, **kwargs):
+		context = super(DeleteLink, self).get_context_data(**kwargs)
+		context['course'] = self.object.topic.subject.course
+		context['subject'] = self.object.topic.subject
+		context['link'] = self.object
+		context["topic"] = self.object.topic
+		return context
-def render_link(request, id):
+	def get_success_url(self):
+		return reverse_lazy('course:view_topic', kwargs={'slug' : self.object.topic.slug})
+
+def render_link(request, slug):
 	template_name = 'links/render_link.html'
 	context = {
-		'link': get_object_or_404(Link, id = id)
+		'link': get_object_or_404(Link, slug = slug)
 	}
 	return render(request, template_name, context)
@@ -85,18 +102,41 @@ class UpdateLink(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
     template_name = 'links/update_link.html'
     form_class = UpdateLinkForm
     success_url = reverse_lazy('course:links:render_link')
-    def form_valid(self, form):
-        form.save()
-        messages.success(self.request, _('Link updated successfully!'))
-        return super(UpdateLink, self).form_valid(form)
+    def form_invalid(self,form):
+        context = super(UpdateLink, self).form_invalid(form)
+        context.status_code = 400
+        return context
+    def form_valid(self, form):
+        formulario = form
+        if formulario.has_changed():
+            if  'link_url' in formulario.changed_data:
+                self.object = form.save()
+                self.link = Link.objects.get(slug = self.object.slug)
+                self.formato,self.baixado = get_images(self.link.link_url,self.link.slug)
+                self.caminho = 'links/static/images/%s'%(self.link.slug)+'%s'%(self.formato)
+                self.setImage()
+            else:
+                form.save()
+        else:
+            form.save()
+        return super(UpdateLink, self).form_valid(form)
+    def setImage(self):
+        if self.baixado:
+            with open(self.caminho,'rb') as f:
+                data = f.read()
+            nome = '%s'%(self.link.slug)+"%s"%(self.formato)
+            self.object.image.save(nome,ContentFile(data))
+        else:
+            with open('links/static/images/default.jpg','rb') as f:
+                data = f.read()
+            self.object.image.save('default.jpg',ContentFile(data))
     def get_object(self, queryset=None):
         self.object = get_object_or_404(Link, slug = self.kwargs.get('slug'))
-        print(self.object.link_description)
         return self.object
     def get_success_url(self):
-        self.success_url = redirect('course:links:render_link', id = self.object.id)
+        self.success_url = reverse_lazy('course:links:render_link', args = (self.object.slug, ))
         return self.success_url
 class ViewLink(LoginRequiredMixin,HasRoleMixin,generic.DetailView):
     allowed_roles = ['professor', 'system_admin']
@@ -109,7 +149,7 @@ class ViewLink(LoginRequiredMixin,HasRoleMixin,generic.DetailView):
         context['link'] = link
         return context
     def get_success_url(self):
-        self.success_url = redirect('course:links:render_link', id = self.object.id)
+        self.success_url = redirect('course:links:render_link', slug = self.object.slug)
         return self.success_url
     def get_queryset(self):
         self.queryset = Link.objects.filter(slug = self.kwargs.get('slug'))
1	{% load static i18n list_topic_foruns permission_tags %}	1	{% load static i18n list_topic_foruns permission_tags %}
2	<div id="list-topic{{ topic.id }}-links">	2	<div id="list-topic{{ topic.id }}-links">
3	{% for link in links%}	3	{% for link in links%}
4	- <li><i class="fa fa-link" aria-hidden="true"></i> <a href="javascript:get_modal_link('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#divModalLink')">{{link}}</a></li>	4	+ <li id = "link_{{ link.slug }}"><i class="fa fa-link" aria-hidden="true"></i> <a href="javascript:get_modal_link('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#divModalLink')">{{link.name}}</a></li>
5	{% endfor %}	5	{% endfor %}
6	</div>	6	</div>
7	<div class = 'row' id ="divModalLink">	7	<div class = 'row' id ="divModalLink">
	@@ -47,7 +47,7 @@ function createForum(url, topic) {		@@ -47,7 +47,7 @@ function createForum(url, topic) {
47	$(".forum_form").html(data);	47	$(".forum_form").html(data);
48	$("#id_topic").val(topic);	48	$("#id_topic").val(topic);
49		49
50	- setForumCreateFormSubmit();	50	+ setForumCreateFormSubmit(topic);
51	}	51	}
52	});	52	});
53		53
	@@ -59,7 +59,7 @@ function createForum(url, topic) {		@@ -59,7 +59,7 @@ function createForum(url, topic) {
59	* Function to set the forum's create form submit function	59	* Function to set the forum's create form submit function
60	*	60	*
61	*/	61	*/
62	-function setForumCreateFormSubmit() {	62	+function setForumCreateFormSubmit(topic) {
63	$('.date-picker').datepicker({	63	$('.date-picker').datepicker({
64	language: locale,	64	language: locale,
65	});	65	});
	@@ -72,13 +72,13 @@ function setForumCreateFormSubmit() {		@@ -72,13 +72,13 @@ function setForumCreateFormSubmit() {
72	data: frm.serialize(),	72	data: frm.serialize(),
73	dataType: "json",	73	dataType: "json",
74	success: function (data) {	74	success: function (data) {
75	- $('.foruns_list').append("<li><i class='fa fa-commenting' aria-hidden='true'></i> <a id='forum_"+data.forum_id+"' href='"+data.url+"'> "+data.name+"</a></li>");	75	+ $(".topic_" + topic).find('.foruns_list').append("<li><i class='fa fa-commenting' aria-hidden='true'></i> <a id='forum_"+data.forum_id+"' href='"+data.url+"'> "+data.name+"</a></li>");
76		76
77	$("#createForum").modal('hide');	77	$("#createForum").modal('hide');
78	},	78	},
79	error: function(data) {	79	error: function(data) {
80	$(".forum_form").html(data.responseText);	80	$(".forum_form").html(data.responseText);
81	- setForumCreateFormSubmit();	81	+ setForumCreateFormSubmit(topic);
82	}	82	}
83	});	83	});
84	return false;	84	return false;
	@@ -3,8 +3,8 @@ from django.contrib import admin		@@ -3,8 +3,8 @@ from django.contrib import admin
3	from .models import Link	3	from .models import Link
4		4
5	class LinkAdmin(admin.ModelAdmin):	5	class LinkAdmin(admin.ModelAdmin):
6	- list_display = ['name', 'link_url','link_description']
7	- search_fields = ['name', 'link_url','link_description']	6	+ list_display = ['name', 'slug','link_url','link_description']
		7	+ search_fields = ['name','slug' ,'link_url','link_description']
8		8
9		9
10	admin.site.register(Link, LinkAdmin)	10	admin.site.register(Link, LinkAdmin)
	@@ -21,6 +21,15 @@ class CreateLinkForm(forms.ModelForm):		@@ -21,6 +21,15 @@ class CreateLinkForm(forms.ModelForm):
21	fields = ['name','link_url','link_description']	21	fields = ['name','link_url','link_description']
22		22
23	class UpdateLinkForm(forms.ModelForm):	23	class UpdateLinkForm(forms.ModelForm):
		24	+ def clean_link_url(self):
		25	+ link_url = self.cleaned_data['link_url']
		26	+ try:
		27	+ resposta = requests.head(link_url)
		28	+ if resposta.status_code >= 400:
		29	+ raise forms.ValidationError(_('Invalid url!'))
		30	+ except requests.ConnectionError:
		31	+ raise forms.ValidationError(_('Invalid url!'))
		32	+ return link_url
24	class Meta:	33	class Meta:
25	model = Link	34	model = Link
26	fields = ['name','link_url','link_description']	35	fields = ['name','link_url','link_description']
	@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
		1	+.modal-backdrop{
		2	+ z-index: 0;
		3	+}
0	\ No newline at end of file	4	\ No newline at end of file
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+function get_modal_link(url, id,div_content){
	2	+ $.get(url, function (data) {
	3	+ $(div_content).empty();
	4	+ $(div_content).append(data);
	5	+ $(id).modal('show');
	6	+ });
	7	+
	8	+}
1	-{% load widget_tweaks i18n %}
2	-<!-- MODAL REMOVE LINK -->
3	-<div class="modal" id="removeLink">
4	- <div class="modal-dialog">
5	- <div class="modal-content">
6	- <div class="modal-header">
7	- <button type="button" class="close" data-dismiss="modal" aria-hidden="true">X</button>
8	- <h4 class="modal-title"></h4>
9	- </div>
10	- <div class="modal-body">
11	- <p>{% trans 'Do you really want to delete this link?' %}</p>
12	- </div>
13	- <div class="modal-footer">
14	- <!-- -->
15	- <button type="button" class="btn btn-primary btn-default" data-dismiss="modal">{% trans 'Cancel' %}</button>
16	- <a href="http://www.google.com" target="_self"><button type="button" class="btn btn-primary" data-dismiss="modal" aria-hidden="true">{% trans 'Confirm' %}</button></a>	1	+{% load static widget_tweaks i18n %}
17		2
18	- </div>	3	+<!-- MODAL DELETE LINK -->
		4	+<link rel="stylesheet" type="text/css" href="{% static 'css/link.css' %}">
		5	+
		6	+<div class="erro-update">
		7	+ <div class="modal fade" id="linkDeleteModal" tabindex="-1" role="dialog" aria-labelledby="deleteLinkLabel" style="z-index: 10">
		8	+ <div class="modal-dialog" role="document">
		9	+ <div class="modal-content">
		10	+ <div class="modal-header">
		11	+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
		12	+ <h4 class="modal-title" id="deleteLinkLabel">{% trans 'Delete Link' %}</h4>
		13	+ </div>
		14	+ <div class="modal-body">
		15	+ <!-- Card -->
		16	+ <form class="form-horizontal" method="post" id="form-delete-link" enctype="multipart/form-data">
		17	+ {% csrf_token %}
		18	+ <fieldset>
		19	+ <div class="col-md-12">
		20	+ {% trans "Are you sure to delete the link " %} <strong>"{{ link.name }}"</strong> </a> of {{ link.topic.name }}?
		21	+ </div>
		22	+ <div class="form-group">
		23	+ <div class="col-md-12">
		24	+ <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
		25	+ <button class="btn btn-raised btn-primary" type="submit">{% trans 'Delete' %}</button>
		26	+ </div>
		27	+ </div>
		28	+ </fieldset>
		29	+ </form>
		30	+ <!-- .end Card -->
		31	+ </div>
		32	+ </div>
		33	+ </div>
19	</div>	34	</div>
20	- </div>
21	</div>	35	</div>
22	-<!-- END -->	36	+
		37	+{% block script_link %}
		38	+
		39	+ {# // <script src="{% static 'js/link.js' %}"></script> #}
		40	+ <script type="text/javascript">
		41	+ $("#form-delete-link").submit(function(event) {
		42	+ var data = new FormData($('#form-delete-link').get(0));
		43	+ $.ajax({
		44	+ url: "{% url 'course:links:delete_link' link.slug %}",
		45	+ type: $("#form-delete-link").attr('method'),
		46	+ data: data,
		47	+ cache: false,
		48	+ processData: false,
		49	+ contentType: false,
		50	+ success: function(data) {
		51	+ $('#linkDeleteModal').modal('hide');
		52	+ $('#link_{{ link.slug }}').remove();
		53	+ $('#link_edit_icon_{{ link.slug }}').remove();
		54	+ $('#link_edit_{{ link.slug }}').remove();
		55	+ alertify.alert('Link successfully deleted!')
		56	+ },
		57	+ error: function(data){
		58	+ // $('.erro-update').html(data.responseText);
		59	+ $('.modal-backdrop').remove();
		60	+ $('#linkDeteleModal').modal();
		61	+ alertify.alert('Error when trying to delete.');
		62	+ }
		63	+ });
		64	+ event.preventDefault();
		65	+ });
		66	+ </script>
		67	+{% endblock script_link %}
		68	+<!-- EndModal -->
	@@ -5,29 +5,73 @@		@@ -5,29 +5,73 @@
5	<div class="modal-content">	5	<div class="modal-content">
6	<div class="modal-header">	6	<div class="modal-header">
7	<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>	7	<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
8	- <h4 class="modal-title" id="myModalLabel">{% trans 'Links' %}</h4>	8	+ <h4 class="modal-title" id="myModalLabel">{% trans 'Edit Link' %}</h4>
9	</div>	9	</div>
10	<div class="modal-body">	10	<div class="modal-body">
11	<!-- Card -->	11	<!-- Card -->
		12	+ <form class="form-horizontal" method="post" id="form-update-link" enctype="multipart/form-data">
		13	+ {% csrf_token %}
		14	+ {% for field in form %}
		15	+ <div class="form-group is-empty">
		16	+ <div class="col-md-12">
		17	+ {% if field.field.required %}
		18	+ <label for="{{ field.auto_id }}" class="control-label">{{ field.label }}<span>*</span></label>
		19	+ {% else %}
		20	+ <label for="{{ field.auto_id }}" class=" control-label">{{ field.label }}</label>
		21	+ {% endif %}
		22	+ {% render_field field class='form-control input-sm' %}
		23	+ </div>
		24	+ </div>
		25	+ {% if field.errors %}
		26	+ <div class="alert alert-danger alert-dismissible clearfix" role="alert">
		27	+ <button type="button" class="close" data-dismiss="alert" aria-label="Close">
		28	+ <span aria-hidden="true">×</span>
		29	+ </button>
		30	+ <ul>
		31	+ {% for error in field.errors %}
		32	+ <li>{{ error }}</li>
		33	+ {% endfor %}
		34	+ </ul>
		35	+ </div>
		36	+ {% endif %}
		37	+ {% endfor %}
12	<div class="form-group">	38	<div class="form-group">
13	- <label class="control-label" for="inputDefault">{% trans 'Name' %}</label>
14	- <input value="Python" type="text" class="form-control" id="inputDefault">	39	+ <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Cancel" %}</button>
		40	+ <button class="btn btn-raised btn-primary" type="submit">{% trans 'Submit' %}</button>
15	</div>	41	</div>
16	- <div class="form-group">
17	- <label class="control-label" for="inputDefault">{% trans 'URL' %}</label>
18	- <input value="https://www.python.org/" type="text" class="form-control" id="inputDefault">
19	- </div>
20	- <div class="form-group is-empty">
21	- <label class="control-label" for="inputDefault">{% trans 'Description' %}</label>
22	- <textarea class="form-control" rows="3"></textarea>
23	- </div>
24	- <div class="form-group">
25	- <a href="javascript:void(0)" class="btn btn-raised btn-default" data-dismiss="modal">{% trans 'Cancel' %}</a>
26	- <a href="javascript:void(0)" class="btn btn-raised btn-primary">{% trans 'Submit' %}</a>
27	- </div>
28	<!-- .end Card -->	42	<!-- .end Card -->
29	</div>	43	</div>
30	</div>	44	</div>
31	</div>	45	</div>
32	</div>	46	</div>
33	<!-- EndModal -->	47	<!-- EndModal -->
		48	+{% block script_link %}
		49	+
		50	+ {# // <script src="{% static 'js/links.js' %}"></script> #}
		51	+ <script type="text/javascript">
		52	+ $("#form-update-link").submit(function(event) {
		53	+ var data = new FormData($('#form-update-link').get(0));
		54	+ $.ajax({
		55	+ url: "{% url 'course:links:update_link' link.slug %}",
		56	+ type: $("#form-update-link").attr('method'),
		57	+ data: data,
		58	+ cache: false,
		59	+ processData: false,
		60	+ contentType: false,
		61	+ success: function(data) {
		62	+ $('#linksModalEdit').modal('hide');
		63	+ $('#link_edit_{{ link.slug }}').replaceWith(data);
		64	+ $('#link_{{ link.slug }}').replaceWith(data);
		65	+ alertify.alert("Sucessfully Updated!")
		66	+ },
		67	+ error: function(data){
		68	+ $('.erro-update').html(data.responseText);
		69	+ $('.modal-backdrop').remove();
		70	+ $('#linksModalEdit').modal();
		71	+ alertify.alert('Invalid link, insert a valid one!');
		72	+ }
		73	+ });
		74	+ event.preventDefault();
		75	+ });
		76	+ </script>
		77	+{% endblock script_link %}
	@@ -9,7 +9,7 @@ from rolepermissions.mixins import HasRoleMixin		@@ -9,7 +9,7 @@ from rolepermissions.mixins import HasRoleMixin
9	from core.mixins import NotificationMixin	9	from core.mixins import NotificationMixin
10	from django.urls import reverse	10	from django.urls import reverse
11	from django.core.files.base import ContentFile	11	from django.core.files.base import ContentFile
12	-	12	+from rolepermissions.verifications import has_role
13		13
14	from .image_crawler import *	14	from .image_crawler import *
15	from courses.models import Topic	15	from courses.models import Topic
	@@ -62,20 +62,37 @@ class CreateLink(LoginRequiredMixin, HasRoleMixin, NotificationMixin, generic.Cr		@@ -62,20 +62,37 @@ class CreateLink(LoginRequiredMixin, HasRoleMixin, NotificationMixin, generic.Cr
62	context["topic"] = topic	62	context["topic"] = topic
63	return context	63	return context
64	def get_success_url(self):	64	def get_success_url(self):
65	- self.success_url = redirect('course:links:render_link', id = self.object.id)	65	+ self.success_url = redirect('course:links:render_link', slug = self.object.slug)
66	return self.success_url	66	return self.success_url
67	-def deleteLink(request,linkname):
68	- link = get_object_or_404(Link,name = linkname)
69	- link.delete()
70	- template_name = 'links/delete_link.html'
71	- messages.success(request,_("Link deleted Successfully!"))
72		67
73	- return redirect('course:manage')	68	+class DeleteLink(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
		69	+ allowed_roles = ['professor', 'system_admin']
		70	+ login_url = reverse_lazy("core:home")
		71	+ redirect_field_name = 'next'
		72	+ model = Link
		73	+ template_name = 'links/delete_link.html'
		74	+
		75	+ def dispatch(self, args, *kwargs):
		76	+ link = get_object_or_404(Link, slug = self.kwargs.get('slug'))
		77	+ if(not (link.topic.owner == self.request.user) and not(has_role(self.request.user, 'system_admin')) ):
		78	+ return self.handle_no_permission()
		79	+ return super(DeleteLink, self).dispatch(args, *kwargs)
		80	+
		81	+ def get_context_data(self, **kwargs):
		82	+ context = super(DeleteLink, self).get_context_data(**kwargs)
		83	+ context['course'] = self.object.topic.subject.course
		84	+ context['subject'] = self.object.topic.subject
		85	+ context['link'] = self.object
		86	+ context["topic"] = self.object.topic
		87	+ return context
74		88
75	-def render_link(request, id):	89	+ def get_success_url(self):
		90	+ return reverse_lazy('course:view_topic', kwargs={'slug' : self.object.topic.slug})
		91	+
		92	+def render_link(request, slug):
76	template_name = 'links/render_link.html'	93	template_name = 'links/render_link.html'
77	context = {	94	context = {
78	- 'link': get_object_or_404(Link, id = id)	95	+ 'link': get_object_or_404(Link, slug = slug)
79	}	96	}
80	return render(request, template_name, context)	97	return render(request, template_name, context)
81		98
	@@ -85,18 +102,41 @@ class UpdateLink(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):		@@ -85,18 +102,41 @@ class UpdateLink(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
85	template_name = 'links/update_link.html'	102	template_name = 'links/update_link.html'
86	form_class = UpdateLinkForm	103	form_class = UpdateLinkForm
87	success_url = reverse_lazy('course:links:render_link')	104	success_url = reverse_lazy('course:links:render_link')
88	- def form_valid(self, form):
89	- form.save()
90	- messages.success(self.request, _('Link updated successfully!'))
91		105
92	- return super(UpdateLink, self).form_valid(form)	106	+ def form_invalid(self,form):
		107	+ context = super(UpdateLink, self).form_invalid(form)
		108	+ context.status_code = 400
93		109
		110	+ return context
		111	+ def form_valid(self, form):
		112	+ formulario = form
		113	+ if formulario.has_changed():
		114	+ if 'link_url' in formulario.changed_data:
		115	+ self.object = form.save()
		116	+ self.link = Link.objects.get(slug = self.object.slug)
		117	+ self.formato,self.baixado = get_images(self.link.link_url,self.link.slug)
		118	+ self.caminho = 'links/static/images/%s'%(self.link.slug)+'%s'%(self.formato)
		119	+ self.setImage()
		120	+ else:
		121	+ form.save()
		122	+ else:
		123	+ form.save()
		124	+ return super(UpdateLink, self).form_valid(form)
		125	+ def setImage(self):
		126	+ if self.baixado:
		127	+ with open(self.caminho,'rb') as f:
		128	+ data = f.read()
		129	+ nome = '%s'%(self.link.slug)+"%s"%(self.formato)
		130	+ self.object.image.save(nome,ContentFile(data))
		131	+ else:
		132	+ with open('links/static/images/default.jpg','rb') as f:
		133	+ data = f.read()
		134	+ self.object.image.save('default.jpg',ContentFile(data))
94	def get_object(self, queryset=None):	135	def get_object(self, queryset=None):
95	self.object = get_object_or_404(Link, slug = self.kwargs.get('slug'))	136	self.object = get_object_or_404(Link, slug = self.kwargs.get('slug'))
96	- print(self.object.link_description)
97	return self.object	137	return self.object
98	def get_success_url(self):	138	def get_success_url(self):
99	- self.success_url = redirect('course:links:render_link', id = self.object.id)	139	+ self.success_url = reverse_lazy('course:links:render_link', args = (self.object.slug, ))
100	return self.success_url	140	return self.success_url
101	class ViewLink(LoginRequiredMixin,HasRoleMixin,generic.DetailView):	141	class ViewLink(LoginRequiredMixin,HasRoleMixin,generic.DetailView):
102	allowed_roles = ['professor', 'system_admin']	142	allowed_roles = ['professor', 'system_admin']
	@@ -109,7 +149,7 @@ class ViewLink(LoginRequiredMixin,HasRoleMixin,generic.DetailView):		@@ -109,7 +149,7 @@ class ViewLink(LoginRequiredMixin,HasRoleMixin,generic.DetailView):
109	context['link'] = link	149	context['link'] = link
110	return context	150	return context
111	def get_success_url(self):	151	def get_success_url(self):
112	- self.success_url = redirect('course:links:render_link', id = self.object.id)	152	+ self.success_url = redirect('course:links:render_link', slug = self.object.slug)
113	return self.success_url	153	return self.success_url
114	def get_queryset(self):	154	def get_queryset(self):
115	self.queryset = Link.objects.filter(slug = self.kwargs.get('slug'))	155	self.queryset = Link.objects.filter(slug = self.kwargs.get('slug'))