Commit 13a3166b by Dányi Bence

merge

parents e1e57b4c b38e5859
...@@ -77,21 +77,21 @@ body { ...@@ -77,21 +77,21 @@ body {
float: left; float: left;
} }
* { * {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.clear { .clear {
clear: both; clear: both;
} }
a { a {
text-decoration: none; text-decoration: none;
} }
abbr { abbr {
border-bottom: 1px dotted #666; border-bottom: 1px dotted #666;
} }
a:link, a:link,
a:visited { a:visited {
color: black; color: black;
} }
strong { strong {
font-size: .9em; font-size: .9em;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<html lang="{{lang}}"> <html lang="{{lang}}">
<head> <head>
<title>{% block title %}IK Cloud{% endblock %}</title> <title>{% block title %}IK Cloud{% endblock %}</title>
<link href='http://fonts.googleapis.com/css?family=Titillium+Web&amp;subset=latin,latin-ext' rel='stylesheet' type='text/css'> <link href="https://fonts.googleapis.com/css?family=Titillium+Web&amp;subset=latin,latin-ext" rel="stylesheet" type="text/css">
<link rel="icon" type="image/png" href="/static/favicon.png" /> <link rel="icon" type="image/png" href="/static/favicon.png" />
<link rel="icon" type="image/png" href="one/static/favicon.png"> <link rel="icon" type="image/png" href="one/static/favicon.png">
<link rel="stylesheet/less" href="/static/style.less" /> <link rel="stylesheet/less" href="/static/style.less" />
......
...@@ -55,9 +55,10 @@ def login(request): ...@@ -55,9 +55,10 @@ def login(request):
else: else:
attended = attended.split(';') attended = attended.split(';')
for c in attended: for c in attended:
co, created = Course.objects.get_or_create(code=c) try:
if created: co = Course.objects.get(code=c)
logger.warning("django Course %s created" % c) except:
continue
g = co.get_or_create_default_group() g = co.get_or_create_default_group()
if p.course_groups.filter(semester=sem, course=co).count() == 0: if p.course_groups.filter(semester=sem, course=co).count() == 0:
try: try:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment