Goals adjusts

Zambom
1 parent fb729f14
Showing 3 changed files with 7 additions and 11 deletions Show diff stats
goals/views.py
topics/locale/pt_BR/LC_MESSAGES/django.po
topics/templates/topics/list.html
@@ -32,7 +32,7 @@ class Reports(LoginRequiredMixin, generic.ListView):
 		slug = self.kwargs.get('slug', '')
 		goals = get_object_or_404(Goals, slug = slug)
-		if not has_resource_permissions(request.user, goals):
+		if not has_subject_permissions(request.user, goals):
 			return redirect(reverse_lazy('subjects:home'))
 		return super(Reports, self).dispatch(request, *args, **kwargs)
@@ -90,7 +90,7 @@ class AnsweredReport(LoginRequiredMixin, generic.ListView):
 		slug = self.kwargs.get('slug', '')
 		goals = get_object_or_404(Goals, slug = slug)
-		if not has_resource_permissions(request.user, goals):
+		if not has_subject_permissions(request.user, goals):
 			return redirect(reverse_lazy('subjects:home'))
 		return super(AnsweredReport, self).dispatch(request, *args, **kwargs)
@@ -130,7 +130,7 @@ class UnansweredReport(LoginRequiredMixin, generic.ListView):
 		slug = self.kwargs.get('slug', '')
 		goals = get_object_or_404(Goals, slug = slug)
-		if not has_resource_permissions(request.user, goals):
+		if not has_subject_permissions(request.user, goals):
 			return redirect(reverse_lazy('subjects:home'))
 		return super(UnansweredReport, self).dispatch(request, *args, **kwargs)
@@ -164,7 +164,7 @@ class HistoryReport(LoginRequiredMixin, generic.ListView):
 		slug = self.kwargs.get('slug', '')
 		goals = get_object_or_404(Goals, slug = slug)
-		if not has_resource_permissions(request.user, goals):
+		if not has_subject_permissions(request.user, goals):
 			return redirect(reverse_lazy('subjects:home'))
 		return super(HistoryReport, self).dispatch(request, *args, **kwargs)
@@ -118,7 +118,7 @@ msgstr &quot;Editar&quot;
 #: topics/templates/resources/list.html:33
 msgid "Reports"
-msgstr ""
+msgstr "Relatórios"
 #: topics/templates/resources/list.html:35 topics/templates/topics/list.html:29
 msgid "Remove"
@@ -173,10 +173,8 @@ msgid &quot;Webpage&quot;
 msgstr "Página Web"
 #: topics/templates/topics/list.html:61
-#, fuzzy
-#| msgid "Topics"
 msgid "Topic Goals"
-msgstr "Tópicos"
+msgstr "Metas do Tópico"
 #: topics/templates/topics/list.html:62
 msgid "Questionary"
@@ -197,8 +195,6 @@ msgid &quot;Topic \&quot;%s\&quot; was updated on virtual enviroment \&quot;%s\&quot; successfully!&quot;
 msgstr "Tópico \"%s\" foi atualizado no ambiente virtual \"%s\" com sucesso!"
 #: topics/views.py:193
-#, fuzzy
-#| msgid "Could not remove this topic. It has on or more resources attached."
 msgid "Could not remove this topic. It has one or more resources attached."
 msgstr ""
 "Não é possível remover esse tópico. Ele possui um ou mais recursos "
@@ -57,8 +57,8 @@
 							    	<li><a href="#"><i class="fa fa-comments-o"></i> {% trans 'Forum' %}</a></li>
 							    	<li><a href="{% url 'file_links:create' topic.slug %}"><i class="fa fa-file-archive-o"></i> {% trans 'File Link' %}</a></li>
 							    	<li><a href="{% url 'links:create' topic.slug %}" > <i class="fa fa-globe"></i> {% trans "Link to Website" %}</a>
-							    	<li><a href="{% url 'webpages:create' topic.slug %}"><i class="fa fa-file-code-o"></i> {% trans 'Webpage' %}</a></li>
 							    	<li><a href="{% url 'goals:create' topic.slug %}"><i class="fa fa-line-chart"></i> {% trans 'Topic Goals' %}</a></li>
+							    	<li><a href="{% url 'webpages:create' topic.slug %}"><i class="fa fa-file-code-o"></i> {% trans 'Webpage' %}</a></li>
 							    	<li><a href="#"><i class="fa fa-question-circle-o"></i> {% trans 'Questionary' %}</a></li>
 							  	</ul>
	@@ -32,7 +32,7 @@ class Reports(LoginRequiredMixin, generic.ListView):		@@ -32,7 +32,7 @@ class Reports(LoginRequiredMixin, generic.ListView):
32	slug = self.kwargs.get('slug', '')	32	slug = self.kwargs.get('slug', '')
33	goals = get_object_or_404(Goals, slug = slug)	33	goals = get_object_or_404(Goals, slug = slug)
34		34
35	- if not has_resource_permissions(request.user, goals):	35	+ if not has_subject_permissions(request.user, goals):
36	return redirect(reverse_lazy('subjects:home'))	36	return redirect(reverse_lazy('subjects:home'))
37		37
38	return super(Reports, self).dispatch(request, args, *kwargs)	38	return super(Reports, self).dispatch(request, args, *kwargs)
	@@ -90,7 +90,7 @@ class AnsweredReport(LoginRequiredMixin, generic.ListView):		@@ -90,7 +90,7 @@ class AnsweredReport(LoginRequiredMixin, generic.ListView):
90	slug = self.kwargs.get('slug', '')	90	slug = self.kwargs.get('slug', '')
91	goals = get_object_or_404(Goals, slug = slug)	91	goals = get_object_or_404(Goals, slug = slug)
92		92
93	- if not has_resource_permissions(request.user, goals):	93	+ if not has_subject_permissions(request.user, goals):
94	return redirect(reverse_lazy('subjects:home'))	94	return redirect(reverse_lazy('subjects:home'))
95		95
96	return super(AnsweredReport, self).dispatch(request, args, *kwargs)	96	return super(AnsweredReport, self).dispatch(request, args, *kwargs)
	@@ -130,7 +130,7 @@ class UnansweredReport(LoginRequiredMixin, generic.ListView):		@@ -130,7 +130,7 @@ class UnansweredReport(LoginRequiredMixin, generic.ListView):
130	slug = self.kwargs.get('slug', '')	130	slug = self.kwargs.get('slug', '')
131	goals = get_object_or_404(Goals, slug = slug)	131	goals = get_object_or_404(Goals, slug = slug)
132		132
133	- if not has_resource_permissions(request.user, goals):	133	+ if not has_subject_permissions(request.user, goals):
134	return redirect(reverse_lazy('subjects:home'))	134	return redirect(reverse_lazy('subjects:home'))
135		135
136	return super(UnansweredReport, self).dispatch(request, args, *kwargs)	136	return super(UnansweredReport, self).dispatch(request, args, *kwargs)
	@@ -164,7 +164,7 @@ class HistoryReport(LoginRequiredMixin, generic.ListView):		@@ -164,7 +164,7 @@ class HistoryReport(LoginRequiredMixin, generic.ListView):
164	slug = self.kwargs.get('slug', '')	164	slug = self.kwargs.get('slug', '')
165	goals = get_object_or_404(Goals, slug = slug)	165	goals = get_object_or_404(Goals, slug = slug)
166		166
167	- if not has_resource_permissions(request.user, goals):	167	+ if not has_subject_permissions(request.user, goals):
168	return redirect(reverse_lazy('subjects:home'))	168	return redirect(reverse_lazy('subjects:home'))
169		169
170	return super(HistoryReport, self).dispatch(request, args, *kwargs)	170	return super(HistoryReport, self).dispatch(request, args, *kwargs)