Make sure local configuration is not pushed to master

kz26 · Feb 22, 2019 · 5ea8679 · 5ea8679
1 parent ab88ed4
commit 5ea8679
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/uchicagohvz/templates/game/list.html b/uchicagohvz/templates/game/list.html
@@ -7,12 +7,15 @@
 <div class="row">
 	<div class="col-md-6">
 	  <h1><a class="btn btn-default btn-lg btn-block" href="{% url 'game|show' pk=game.pk %}">
+			{% if game.is_player %}
+			<span style="vertical-align:middle; color: {{ game.color }}" class="glyphicon glyphicon-bookmark"></span> 
+			{% endif %}
 		{{ game.name }}
 	  </a></h1>
 	  <h3>
 	    {% if game.status == "registration" %}
 	    <span class="text-success">Open for registration</span>
-		{% elif game.status == "in_progress" %}
+	    {% elif game.status == "in_progress" %}
 	    <span class="text-success">LIVE</span>
 	    {% elif game.status == "finished" %}
 	    <span class="text-info">Finished</span>

diff --git a/uchicagohvz/users/views.py b/uchicagohvz/users/views.py
@@ -130,13 +130,7 @@ def get_object(self, queryset=None):
 		return get_object_or_404(Profile, user=self.request.user)
 
 	def form_valid(self, form):
-		user = self.request.user
-		current_game = Game.objects.all()[0];
-		try:
-			current_player = current_game.players.get(user_id = user.id)
-		except Player.DoesNotExist:
-			current_player = None
-		messages.success(self.request, "Account settings updated successfully")
+		messages.success(self.request, "Account settings updated successfully.")
 		return super(MyAccount, self).form_valid(form)
 
 	def get_form_kwargs(self):