Rename own user view to Dashboard
* Hide Observation button if no permissionsmerge-requests/475/head
parent
3e1e9a7cf7
commit
78226519ef
|
@ -69,7 +69,7 @@
|
|||
<span class="caret"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu" role="menu">
|
||||
<li><a href="{% url 'users:view_user' username=request.user.username %}">My Profile</a></li>
|
||||
<li><a href="{% url 'users:view_user' username=request.user.username %}">Dashboard</a></li>
|
||||
<li role="separator" class="divider"></li>
|
||||
{% if request.user.is_superuser %}
|
||||
<li><a href="{% url 'base:settings_site' %}">Site Settings</a></li>
|
||||
|
|
|
@ -26,7 +26,9 @@
|
|||
<span class="glyphicon glyphicon-filter" aria-hidden="true"></span> Filters
|
||||
</a>
|
||||
{% if can_schedule %}
|
||||
<a class="btn btn-primary" href="{% url 'base:observation_new' %}">New Observation</a>
|
||||
<a class="btn btn-primary" href="{% url 'base:observation_new' %}">
|
||||
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span> New Observation
|
||||
</a>
|
||||
{% endif %}
|
||||
</h1>
|
||||
</div>
|
||||
|
|
|
@ -3,7 +3,9 @@
|
|||
{% load static %}
|
||||
{% load tags %}
|
||||
|
||||
{% block title %} - User: {{ user.username }}{% endblock %}
|
||||
{% block title %}
|
||||
{% if user == request.user %} - Dashboard{% else %} - User: {{ user.username }}{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="row">
|
||||
|
@ -195,10 +197,13 @@
|
|||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if user == request.user %}
|
||||
{% if can_schedule %}
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<a class="btn btn-default" href="{% url 'base:observation_new' %}">New Observation</a>
|
||||
<a class="btn btn-default" href="{% url 'base:observation_new' %}">
|
||||
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
|
||||
New Observation
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
|
|
@ -11,6 +11,7 @@ from network.users.forms import UserForm
|
|||
from network.users.models import User
|
||||
from network.base.forms import StationForm
|
||||
from network.base.models import Station, Observation, Antenna, Rig
|
||||
from network.base.perms import schedule_perms
|
||||
|
||||
|
||||
class UserRedirectView(LoginRequiredMixin, RedirectView):
|
||||
|
@ -40,6 +41,11 @@ def view_user(request, username):
|
|||
user = get_object_or_404(User, username=username)
|
||||
observations = Observation.objects.filter(author=user)[0:10]
|
||||
stations = Station.objects.filter(owner=user)
|
||||
|
||||
can_schedule = False
|
||||
if request.user.is_authenticated():
|
||||
can_schedule = schedule_perms(request.user)
|
||||
|
||||
try:
|
||||
token = Token.objects.get(user=user)
|
||||
except Token.DoesNotExist:
|
||||
|
@ -49,10 +55,6 @@ def view_user(request, username):
|
|||
rigs = Rig.objects.all()
|
||||
|
||||
return render(request, 'users/user_detail.html',
|
||||
{'user': user,
|
||||
'observations': observations,
|
||||
'stations': stations,
|
||||
'token': token,
|
||||
'form': form,
|
||||
'antennas': antennas,
|
||||
'rigs': rigs})
|
||||
{'user': user, 'observations': observations, 'stations': stations,
|
||||
'token': token, 'form': form, 'antennas': antennas,
|
||||
'rigs': rigs, 'can_schedule': can_schedule})
|
||||
|
|
Loading…
Reference in New Issue