Merge branch 'dev' of https://github.com/amadeusproject/amadeuslms into dev

Jailson Dias
2 parents b2294e00 866bf3fc
Showing 3 changed files with 10 additions and 25 deletions Show diff stats
courses/static/js/topic_editation_presentation.js
courses/templates/subject/index.html
courses/views.py
@@ -6,7 +6,7 @@ $(document).ready(function(){
 function show_editation(id_topic){
     $(".presentation_"+ id_topic).hide();
     $(".editation_"+ id_topic).show();
-    $('#summernote').summernote({height: 300});
+    $(".editation_"+ id_topic).find('#summernote').summernote({height: 300});
 };
 function show_presentation(id_topic){
@@ -9,7 +9,6 @@
   <script type="text/javascript" src="{% static 'js/modals_requisitions.js' %}"></script>
   <script type = "text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
   <script type = "text/javascript" src="{% static 'js/links.js' %}"></script>
-  <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
   <script src="{% static 'js/modal_poll.js' %}"></script>
 {% endblock %}
@@ -447,28 +447,11 @@ class IndexCatView(LoginRequiredMixin, generic.ListView):
     login_url = reverse_lazy("core:home")
     redirect_field_name = 'next'
-    queryset = CourseCategory.objects.all()
+    queryset = sorted(CourseCategory.objects.all(),key = lambda x:x.name)
     template_name = 'category/index.html'
     context_object_name = 'categories'
     paginate_by = 5
-
-    def get_context_data(self, **kwargs):
-        context = super(IndexCatView, self).get_context_data(**kwargs)
-        list_cat = CourseCategory.objects.filter(course_category = True).order_by('name')
-        paginator = Paginator(list_cat, self.paginate_by)
-        page = self.request.GET.get('page')
-
-        try:
-            list_cat = paginator.page(page)
-        except PageNotAnInteger:
-            list_cat = paginator.page(1)
-        except EmptyPage:
-            list_cat = paginator.page(paginator.num_pages)
-
-        context['list_cat'] = list_cat
-
-        return context
-
+    
 class CreateCatView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView):
     allowed_roles = ['professor', 'system_admin']
@@ -479,7 +462,8 @@ class CreateCatView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView):
     success_url = reverse_lazy('course:manage_cat')
     def get_success_url(self):
-        messages.success(self.request, _('Category created successfully!'))
+        objeto = self.object.name
+        messages.success(self.request, _('Category "%s" created successfully!')%(objeto))
         return reverse_lazy('course:manage_cat')
 class UpdateCatView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
@@ -490,11 +474,13 @@ class UpdateCatView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
     template_name = 'category/update.html'
     model = CourseCategory
     form_class = CategoryCourseForm
+    success_url = reverse_lazy('course:manage_cat')
     def get_success_url(self):
-        messages.success(self.request, _('Category updated successfully!'))
-        return reverse_lazy('course:update_cat', kwargs={'slug' : self.object.slug})
-
+        objeto = self.object.name
+        messages.success(self.request, _('Category "%s" updated successfully!')%(objeto))
+        #return reverse_lazy('course:update_cat', kwargs={'slug' : self.object.slug})
+        return reverse_lazy('course:manage_cat')
 class DeleteCatView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
     allowed_roles = ['professor', 'system_admin']
	@@ -6,7 +6,7 @@ $(document).ready(function(){		@@ -6,7 +6,7 @@ $(document).ready(function(){
6	function show_editation(id_topic){	6	function show_editation(id_topic){
7	$(".presentation_"+ id_topic).hide();	7	$(".presentation_"+ id_topic).hide();
8	$(".editation_"+ id_topic).show();	8	$(".editation_"+ id_topic).show();
9	- $('#summernote').summernote({height: 300});	9	+ $(".editation_"+ id_topic).find('#summernote').summernote({height: 300});
10	};	10	};
11		11
12	function show_presentation(id_topic){	12	function show_presentation(id_topic){
	@@ -9,7 +9,6 @@		@@ -9,7 +9,6 @@
9	<script type="text/javascript" src="{% static 'js/modals_requisitions.js' %}"></script>	9	<script type="text/javascript" src="{% static 'js/modals_requisitions.js' %}"></script>
10	<script type = "text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>	10	<script type = "text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
11	<script type = "text/javascript" src="{% static 'js/links.js' %}"></script>	11	<script type = "text/javascript" src="{% static 'js/links.js' %}"></script>
12	- <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
13	<script src="{% static 'js/modal_poll.js' %}"></script>	12	<script src="{% static 'js/modal_poll.js' %}"></script>
14	{% endblock %}	13	{% endblock %}
15		14