Download as
Browse Code »

Commit ede6717b9f8ae1da747151f1bde218f883e68496

Authored by Matheus Lins
1 parent bfdd320f
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

all courses to admin

Showing 4 changed files with 24 additions and 8 deletions   Show diff stats
courses/templates/category/index.html
  Diff comments   View file @ede6717
@@ -80,11 +80,10 @@ @@ -80,11 +80,10 @@
80 <td>{{ category }}</td> 80 <td>{{ category }}</td>
81 <td>{{ category.slug }}</td> 81 <td>{{ category.slug }}</td>
82 <td class="text-center"> 82 <td class="text-center">
83 - <a href="{% url 'course:view_cat' category.slug %}" class="btn btn-info btn-sm"><span class="glyphicon glyphicon-eye-open"></span></a>  
84 - <a href="{% url 'course:update_cat' category.slug %}" class="btn btn-primary btn-sm"><span class="glyphicon glyphicon-edit"></span></a>  
85 - <a href="javascript:modal.get('{% url 'course:delete_cat' category.slug %}','#category','#modal_category');" class="btn btn-danger btn-sm"><span class="glyphicon glyphicon-trash"></span></a>  
86 -  
87 - </td> 83 + <a href="{% url 'course:view_cat' category.slug %}" class="btn btn-info btn-sm"><span class="glyphicon glyphicon-eye-open"></span></a>
  84 + <a href="{% url 'course:update_cat' category.slug %}" class="btn btn-primary btn-sm"><span class="glyphicon glyphicon-edit"></span></a>
  85 + <a href="javascript:modal.get('{% url 'course:delete_cat' category.slug %}','#category','#modal_category');" class="btn btn-danger btn-sm"><span class="glyphicon glyphicon-trash"></span></a>
  86 + </td>
88 </tr> 87 </tr>
89 {% endfor %} 88 {% endfor %}
90 {% else %} 89 {% else %}
courses/templates/course/index.html
  Diff comments   View file @ede6717
@@ -41,6 +41,21 @@ @@ -41,6 +41,21 @@
41 </ul> 41 </ul>
42 </div> 42 </div>
43 </div> 43 </div>
  44 +
  45 + {% if user|has_role:'professor' or user|has_role:'system_admin' %}
  46 +
  47 + <div class="panel panel-primary navigation">
  48 + <div class="panel-heading">
  49 + <h3 class="panel-title">Category</h3>
  50 + </div>
  51 + <div class="panel-body">
  52 + <ul class="nav nav-pills nav-stacked">
  53 + <li><a href="{% url 'course:create_cat' %}">Create Category</a></li>
  54 + <li><a href="{% url 'course:manage_cat' %}">List Category</a></li>
  55 + </ul>
  56 + </div>
  57 + </div>
  58 + {% endif %}
44 {% endblock %} 59 {% endblock %}
45 60
46 {% block content %} 61 {% block content %}
@@ -92,7 +107,7 @@ @@ -92,7 +107,7 @@
92 <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i> 107 <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
93 </button> 108 </button>
94 <ul class="dropdown-menu" aria-labelledby="moreActions"> 109 <ul class="dropdown-menu" aria-labelledby="moreActions">
95 - <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; Replicate</a></li> 110 + <li><a href="" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; Replicate</a></li>
96 <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeCourse"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; Remove</a></li> 111 <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeCourse"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; Remove</a></li>
97 </ul> 112 </ul>
98 </div> 113 </div>
courses/templates/course/view.html
  Diff comments   View file @ede6717
@@ -49,7 +49,6 @@ @@ -49,7 +49,6 @@
49 </div> 49 </div>
50 </div> 50 </div>
51 {% endif %} 51 {% endif %}
52 -  
53 {% endblock %} 52 {% endblock %}
54 53
55 {% block content %} 54 {% block content %}
courses/views.py
  Diff comments   View file @ede6717
@@ -34,9 +34,12 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView): @@ -34,9 +34,12 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
34 context = super(IndexView, self).get_context_data(**kwargs) 34 context = super(IndexView, self).get_context_data(**kwargs)
35 list_courses = None 35 list_courses = None
36 categorys_courses = None 36 categorys_courses = None
37 - if has_role(self.request.user,'professor') or has_role(self.request.user,'system_admin'): 37 + if has_role(self.request.user,'professor'):
38 list_courses = Course.objects.filter(Q(professors = True)|Q(professors__name = self.request.user.name)).order_by('name') 38 list_courses = Course.objects.filter(Q(professors = True)|Q(professors__name = self.request.user.name)).order_by('name')
39 categorys_courses = CourseCategory.objects.filter(course_category__professors__name = self.request.user.name).distinct() 39 categorys_courses = CourseCategory.objects.filter(course_category__professors__name = self.request.user.name).distinct()
  40 + elif has_role(self.request.user,'system_admin'):
  41 + list_courses = queryset.order_by('name')
  42 + categorys_courses = CourseCategory.objects.all()
40 else: 43 else:
41 list_courses = Course.objects.filter(Q(students = True)|Q(students__name = self.request.user.name)).order_by('name') 44 list_courses = Course.objects.filter(Q(students = True)|Q(students__name = self.request.user.name)).order_by('name')
42 categorys_courses = CourseCategory.objects.filter(course_category__students__name = self.request.user.name).distinct() 45 categorys_courses = CourseCategory.objects.filter(course_category__students__name = self.request.user.name).distinct()