Merge branch 'master' of atrey:/akce/MaM/MaMweb/mamweb

* 'master' of atrey:/akce/MaM/MaMweb/mamweb:
  Zakladni kostra Aktualniho zadani
  Reseni prav pri nasazovani na server

Makefile

@@ -76,8 +76,8 @@ push_test:
 		cp mamweb/settings_test.py mamweb/settings.py && \
 		make install && \
 		./manage.py migrate --noinput && \
-		chown -R :mam . && \
+		(chown -Rf :mam . || true ) && \
-		chmod -R g+w . && \
+		(chmod -Rf g+w . || true ) && \
 		echo Done."
 	@echo "Test deployed at ${TEST_SERVER}:${TEST_DIR} successfully."
 	

seminar/templates/seminar/AktualZadani.html

@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+{% load staticfiles sekizai_tags %}
+
+{% block content %}
+<div>
+  <h2>Aktuální zadání</h2>
+
+  {% for problem in  nastaveni.aktualni_cislo.zadane_problemy.all %}
+    Problém {{problem}} <br>
+    {% autoescape off %}{{problem.text_problemu}}{% endautoescape %}
+    <hr>
+  {% empty %}
+    Aktuálně nejsou zadané žádné úlohy k řešení.
+  {% endfor %}
+
+</div>
+{% endblock content %}
+

seminar/urls.py

@@ -4,4 +4,5 @@ from . import views
 urlpatterns = patterns('',
     url(r'^problem/(?P<pk>\d+)/$', views.ProblemView.as_view(), name='problem'),
     url(r'^cislo/(?P<pk>\d+)/$', views.CisloView.as_view(), name='cislo'),
+    url(r'^zadani/$', 'seminar.views.AktualZadaniView'),
 )

seminar/views.py

@@ -2,9 +2,15 @@ from django.shortcuts import get_object_or_404, render
 from django.http import HttpResponseRedirect
 from django.core.urlresolvers import reverse
 from django.views import generic
-from .models import Problem, Cislo, Reseni, VysledkyKCislu
+from .models import Problem, Cislo, Reseni, VysledkyKCislu, Nastaveni
 
-# Create your views here.
+
+def AktualZadaniView(request):
+    nastaveni = get_object_or_404(Nastaveni)
+    return render(request, 'seminar/AktualZadani.html',
+            {'nastaveni' : nastaveni,
+                },
+            )
 
 class ProblemView(generic.DetailView):
     model = Problem