Skip to content

Commit 8fc1ed9

Browse files
committed
Add reset cache and restart buttons for RTPs and Evals
1 parent 800b9f2 commit 8fc1ed9

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

conditional/blueprints/cache_management.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def restart_app():
3333
def clear_cache():
3434
user_name = request.headers.get('x-webauth-user')
3535

36-
if not ldap_is_eval_director(user_name):
36+
if not ldap_is_eval_director(user_name) or ldap_is_rtp(user_name):
3737
return redirect("/dashboard")
3838

3939
logger.info('api', action='purge system cache')

conditional/templates/nav.html

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,27 @@
4444
</ul>
4545
</li>
4646
{% endif %}
47-
{% if is_eval_director or is_financial_director %}
47+
{% if is_eval_director or is_financial_director or is_rtp%}
4848
<li class="dropdown">
4949
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-wrench"></span> Admin<span class="caret"></span></a>
5050
<ul class="dropdown-menu">
51-
<li><a href="/manage"><span class="glyphicon glyphicon-user"></span> Member Management</a></li>
51+
52+
{% if is_financial_director or is_eval_director %}
53+
<li><a href="/manage"><span class="glyphicon glyphicon-user"></span> Member Management</a></li>
54+
{% endif %}
55+
5256
{% if is_eval_director %}
57+
<li><a href="/manage/intro_project"><span class="glyphicon glyphicon-tower"></span> Introductory Project Results</a></li>
58+
<li><a href="/slideshow/intro"><span class="glyphicon glyphicon-eye-open"></span> Introductory Evaluations Presentation</a></li>
59+
<li><a href="/slideshow/spring"><span class="glyphicon glyphicon-eye-open"></span> Membership Evaluations Presentation</a></li>
60+
{% endif %}
5361

54-
<li><a href="/manage/intro_project"><span class="glyphicon glyphicon-tower"></span> Introductory Project Results</a></li>
55-
<li><a href="/slideshow/intro"><span class="glyphicon glyphicon-eye-open"></span> Introductory Evaluations Presentation</a></li>
56-
<li><a href="/slideshow/spring"><span class="glyphicon glyphicon-eye-open"></span> Membership Evaluations Presentation</a></li>
62+
{% if is_eval_director or is_rtp %}
63+
<li><a href="/clearcache"><span class="glyphicon glyphicon-floppy-remove"></span> Clear Cache</a></li>
64+
{% endif %}
5765

66+
{% if is_rtp %}
67+
<li><a href="/restart"><span class="glyphicon glyphicon-refresh"></span> Restart Conditional</a></li>
5868
{% endif %}
5969
</ul>
6070
</li>

conditional/util/flask.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from conditional.util.ldap import ldap_is_financial_director
88
from conditional.util.ldap import ldap_is_eval_director
99
from conditional.util.ldap import ldap_is_intromember
10+
from conditional.util.ldap import ldap_is_rtp
1011
from conditional import db
1112

1213

@@ -27,6 +28,7 @@ def render_template(request, template_name, **kwargs):
2728
is_financial = ldap_is_financial_director(user_name)
2829
is_eval = ldap_is_eval_director(user_name)
2930
is_intromember = ldap_is_intromember(user_name)
31+
is_rtp = ldap_is_rtp(user_name)
3032

3133
if is_eval:
3234
lockdown = False
@@ -40,4 +42,5 @@ def render_template(request, template_name, **kwargs):
4042
is_eval_director=is_eval,
4143
is_financial_director=is_financial,
4244
is_intromember=is_intromember,
45+
is_rtp=is_rtp,
4346
**kwargs)

0 commit comments

Comments
 (0)