org_index: Výsledkovky pro hierarchické odkazy

mo/web/org.py

@@ -90,7 +90,7 @@ def org_index():
             if ct:
                 o.rights = g.gatekeeper.rights_for_contest(ct)
             else:
-                o.rights = g.gatekeeper.rights_for_round(r)
+                o.rights = g.gatekeeper.rights_for_round(r, for_place=ur.place)
             overview.append(o)
         o.role_set.add(ur.role)
 

mo/web/templates/org_index.html

@@ -83,11 +83,11 @@
 				</form>
 				{% endif %}
 				{% if o.contest %}
-				{% if o.rights.can_view_submits() and o.contest.state != RoundState.preparing %}
-				<a class="btn btn-xs btn-success" href='{{ url_for('org_contest_solutions', ct_id=o.contest.contest_id) }}'>Odevzdaná řešení</a>
-				{% endif %}
 				{% if (o.contest.state == RoundState.grading and o.rights.have_right(Right.view_contestants)) or o.contest.state == RoundState.closed %}
-				<a class="btn btn-xs btn-warning" href='{{ url_for('org_score', ct_id=o.contest.contest_id) }}'>Výsledky</a>
+				<a class="btn btn-xs btn-warning" href='{{ o.url_for('org_score') }}'>Výsledky</a>
+				{% endif %}
+				{% if o.rights.can_view_submits() and o.contest.state != RoundState.preparing and o.contest.state != RoundState.closed %}
+				<a class="btn btn-xs btn-success" href='{{ url_for('org_contest_solutions', ct_id=o.contest.contest_id) }}'>Odevzdaná řešení</a>
 				{% endif %}
 				{% if o.rights.have_right(Right.manage_contest) and o.contest.state != RoundState.closed %}
 				<a class="btn btn-xs btn-default" href="{{ url_for('org_contest_add_user', ct_id=o.contest.contest_id) }}">+ Přidat účastníka</a>
@@ -95,6 +95,10 @@
 				{% if o.rights.have_right(Right.manage_contest) and o.contest.state == RoundState.preparing %}
 				<a class="btn btn-xs btn-default" href='{{ url_for('org_generic_import', ct_id=o.contest.contest_id) }}'>Import</a>
 				{% endif %}
+				{% else %}
+				{% if (o.lowest_state == RoundState.grading and o.rights.have_right(Right.view_contestants)) or o.lowest_state == RoundState.closed and o.num_contests > 0 %}
+				<a class="btn btn-xs btn-warning" href='{{ o.url_for('org_score') }}'>Výsledky</a>
+				{% endif %}
 				{% endif %}
 			</td>
 		</tr>