From 40d29a809c2a35989de95b70d55c3ca671e509a1 Mon Sep 17 00:00:00 2001
From: Felipe Henrique de Almeida Bormann <fbormann@Felipes-MacBook-Air.local>
Date: Fri, 20 Jan 2017 11:44:06 -0300
Subject: [PATCH] fixed minor issues with this release, but still have work to do on search subjects

---
 amadeus/templates/base.html                   |  2 +-
 subjects/models.py                            |  2 +-
 subjects/templates/subjects/create.html       |  2 +-
 subjects/templates/subjects/subject_card.html |  2 ++
 subjects/templates/subjects/subscribe.html    |  2 +-
 subjects/urls.py                              |  2 +-
 subjects/views.py                             | 36 +++++++++++++++++++++++++++++++++++-
 7 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/amadeus/templates/base.html b/amadeus/templates/base.html
index a09291b..867bb43 100644
--- a/amadeus/templates/base.html
+++ b/amadeus/templates/base.html
@@ -84,7 +84,7 @@
             </div>
             <div class="navbar-collapse collapse navbar-responsive-collapse">
                 <div class="col-md-7 col-md-offset-1 col-sm-6 col-sm-offset-1 col-lg-7 col-lg-offset-1 text-center">
-                    <form id="SearchForm" action="#" method="get" accept-charset="utf-8" class="navbar-form">
+                    <form id="SearchForm" action="{% url 'subjects:search'  %}" method="get" accept-charset="utf-8" class="navbar-form">
                         <div class="input-group">
                             <div class="form-group is-empty" >
                                 <input type="text" class="form-control top-search" placeholder="{% trans 'Search for subjects and resources' %}" name="search">
diff --git a/subjects/models.py b/subjects/models.py
index b554f27..3dcdcaf 100644
--- a/subjects/models.py
+++ b/subjects/models.py
@@ -27,7 +27,7 @@ class Subject(models.Model):
     init_date = models.DateField(_('Begin of Subject Date'))
     end_date = models.DateField(_('End of Subject Date'))
 
-    tags = models.ManyToManyField(Tag, verbose_name='markers', blank=True, null=True)
+    tags = models.ManyToManyField(Tag, verbose_name='tags', blank=True, null=True)
 
     create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True)
     update_date = models.DateTimeField(_('Date of last update'), auto_now=True)
diff --git a/subjects/templates/subjects/create.html b/subjects/templates/subjects/create.html
index 24c1974..356ddad 100644
--- a/subjects/templates/subjects/create.html
+++ b/subjects/templates/subjects/create.html
@@ -18,7 +18,7 @@
 
    	{% if subject %}
    		{% breadcrumb subject.category 'subjects:cat_view' subject.category.slug %}
-   		{% breadcrumb subject 'subjects:view' subject.slug %}
+   		{% breadcrumb subject 'subjects:view' subject.name %}
 
    		{% trans 'Replicate: ' as bread %}
 
diff --git a/subjects/templates/subjects/subject_card.html b/subjects/templates/subjects/subject_card.html
index 394bf5b..dabd1f1 100644
--- a/subjects/templates/subjects/subject_card.html
+++ b/subjects/templates/subjects/subject_card.html
@@ -16,7 +16,9 @@
                                 <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
                             </a>
                             <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
+                            {% if request.user not in subject.professor.all %}
                                 <li><a href="{% url 'subjects:replicate' subject.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
+                            {% endif %}
                                 <li><a href="{% url 'subjects:update' subject.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
                                 <li><a href="{% url 'groups:index' subject.slug %}"><i class="fa fa-group fa-fw" aria-hidden="true"></i>{% trans 'Groups' %}</a></li>
                                 <li><a href="javascript:delete_subject.get('{% url 'subjects:delete' subject.slug %}?view=index','#subject','#modal_subject')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
diff --git a/subjects/templates/subjects/subscribe.html b/subjects/templates/subjects/subscribe.html
index bce69a3..5a24353 100644
--- a/subjects/templates/subjects/subscribe.html
+++ b/subjects/templates/subjects/subscribe.html
@@ -7,7 +7,7 @@
       <!-- Modal Header -->
       <div class="modal-header">
 
-        <h4 class="modal-title" id="myModalLabel">{% trans "Delete Subject" %}</h4>
+        <h4 class="modal-title" id="myModalLabel">{% trans "Subscribe To Subject" %}</h4>
       </div>
       <!-- Modal Body -->
       <div class="modal-body">
diff --git a/subjects/urls.py b/subjects/urls.py
index 536cda8..4502626 100644
--- a/subjects/urls.py
+++ b/subjects/urls.py
@@ -12,5 +12,5 @@ urlpatterns = [
 	url(r'^delete/(?P<slug>[\w_-]+)/$', views.SubjectDeleteView.as_view(), name='delete'),
 	url(r'^view/(?P<slug>[\w_-]+)/$', views.SubjectDetailView.as_view(), name='view'),
 	url(r'^subscribe/(?P<slug>[\w_-]+)/$', views.SubjectSubscribeView.as_view(), name='subscribe'),
-	#url(r'^modal/(?P<subject_slug>[\w_-]+)/$', views.subscribe_subject(), name='subscribe'),
+	url(r'^search/$', views.SubjectSearchView.as_view(), name='search'),
 ]
\ No newline at end of file
diff --git a/subjects/views.py b/subjects/views.py
index ef37da4..7e58a8d 100644
--- a/subjects/views.py
+++ b/subjects/views.py
@@ -38,6 +38,7 @@ class HomeView(LoginRequiredMixin, ListView):
     paginate_by = 10
     total = 0    
 
+
     def get_queryset(self):
         if self.request.user.is_staff:
             subjects = Subject.objects.all().order_by("name")
@@ -342,7 +343,40 @@ class SubjectSubscribeView(LoginRequiredMixin, TemplateView):
 
 class SubjectSearchView(LoginRequiredMixin, ListView):
     login_url = reverse_lazy("users:login")
-    redirect_field_name = 'next'
     template_name = 'subjects/list.html'
     context_object_name = 'categories'
     paginate_by = 10
+   
+    def get_queryset(self):
+        if self.request.user.is_staff:
+            subjects = Subject.objects.all().order_by("name")
+        else:
+            pk = self.request.user.pk
+
+            subjects = Subject.objects.filter(Q(students__pk=pk) | Q(professor__pk=pk) | Q(category__coordinators__pk=pk)).distinct()
+        
+        self.total = len(subjects)
+
+        return subjects
+    def post(self, request, *args, **kwargs):
+        print("aqui")
+
+        return HttpResponse("T")
+
+    def get(self, request, *args, **kwargs):
+        print("get")
+        print(args)
+        print(kwargs)
+        return HttpResponse("t")
+
+
+    def get_context_data(self, **kwargs):
+        context = super(SubjectSearchView, self).get_context_data(**kwargs)
+        print(kwargs)
+        print("teste")
+        tags = kwargs.get('tags').strip()
+        print(tags)
+
+        context['all'] = False
+        context['title'] = _('My Subjects')
+        return context
--
libgit2 0.21.2