priv (unstable)

templates/components/comments_discussion.html

@@ -28,15 +28,15 @@
 
 {% macro reply_operations(doc, rdoc) %}
 <div class="dczcomments__operations nojs--hide">
-{% if handler.hasPerm(reply_post_perm) %}
+{% if handler.user.hasPerm(reply_post_perm) %}
   <a href="javascript:;" data-tooltip="{{ _('Reply') }}" name="dczcomments__op-reply-reply"><span class="icon icon-reply"></span></a>
 {% endif %}
-{% if doc.owner == handler.state.user._id or handler.hasPerm(reply_edit_perm) %}
+{% if doc.owner == handler.state.user._id or handler.user.hasPerm(reply_edit_perm) %}
   <a href="javascript:;" data-tooltip="{{ _('Edit') }}" name="dczcomments__op-edit-reply"
     data-form="{{ {operation: reply_edit_op, drid: doc._id, drrid: rdoc._id}|json }}"
   ><span class="icon icon-edit"></span></a>
 {% endif %}
-{% if doc.owner == handler.state.user._id or handler.hasPerm(reply_delete_perm) %}
+{% if doc.owner == handler.state.user._id or handler.user.hasPerm(reply_delete_perm) %}
   <a href="javascript:;" data-tooltip="{{ _('Delete') }}" name="dczcomments__op-delete-reply"
     data-form="{{ {operation: reply_delete_op, drid: doc._id, drrid: rdoc._id}|json }}"
   ><span class="icon icon-delete"></span></a>
@@ -71,7 +71,7 @@
   reply_delete_op = 'delete_tail_reply'
 ) %}
 <ul class="dczcomments__list view--discussion">
-{% if handler.hasPerm(comment_post_perm) %}
+{% if handler.user.hasPerm(comment_post_perm) %}
 <li class="dczcomments__item">
   <div class="media">
     <div class="media__left top">
@@ -116,17 +116,17 @@
           @ {{ datetimeSpan(doc['_id'])|safe }}
         </div>
         <div class="dczcomments__operations nojs--hide">
-        {% if handler.hasPerm(reply_post_perm) %}
+        {% if handler.user.hasPerm(reply_post_perm) %}
           <a href="javascript:;" data-tooltip="{{ _('Reply') }}" name="dczcomments__op-reply-comment" 
             data-form="{{ {operation: reply_post_op, drid: doc._id}|json }}"
           ><span class="icon icon-reply"></span></a>
         {% endif %}
-        {% if doc.owner == handler.state.user._id or handler.hasPerm(comment_edit_perm) %}
+        {% if doc.owner == handler.state.user._id or handler.user.hasPerm(comment_edit_perm) %}
           <a href="javascript:;" data-tooltip="{{ _('Edit') }}" name="dczcomments__op-edit-comment"
             data-form="{{ {operation: comment_edit_op, drid: doc._id}|json }}"
           ><span class="icon icon-edit"></span></a>
         {% endif %}
-        {% if doc.owner == handler.state.user._id or handler.hasPerm(comment_delete_perm) %}
+        {% if doc.owner == handler.state.user._id or handler.user.hasPerm(comment_delete_perm) %}
           <a href="javascript:;" data-tooltip="{{ _('Delete') }}" name="dczcomments__op-delete-comment"
             data-form="{{ {operation: comment_delete_op, drid: doc._id}|json }}"
           ><span class="icon icon-delete"></span></a>

templates/components/comments_solution.html

@@ -30,7 +30,7 @@
   reply_delete_op = 'delete_tail_reply'
 ) %}
 <ul class="dczcomments__list view--solution">
-{% if handler.hasPerm(comment_post_perm) %}
+{% if handler.user.hasPerm(comment_post_perm) %}
 <li class="dczcomments__item">
   <div class="media">
     <div class="media__left top">
@@ -85,7 +85,7 @@
   <div class="media">
     <div class="media__left top">
       <div class="vote vote--discussion">
-      {% if handler.hasPerm(perm.PERM_VOTE_PROBLEM_SOLUTION) %}
+      {% if handler.user.hasPerm(perm.PERM_VOTE_PROBLEM_SOLUTION) %}
         <div class="vote-number rotator--enabled">{{ doc.vote }}</div>
         <div class="vote-op clearfix">
           <form method="post">
@@ -113,17 +113,17 @@
           @ {{ datetimeSpan(doc._id)|safe }}
         </div>
         <div class="dczcomments__operations nojs--hide">
-        {% if handler.hasPerm(reply_post_perm) %}
+        {% if handler.user.hasPerm(reply_post_perm) %}
           <a href="javascript:;" data-tooltip="{{ _('Reply') }}" name="dczcomments__op-reply-comment" 
             data-form="{{ {operation: reply_post_op, psrid: doc._id}|json }}"
           ><span class="icon icon-reply"></span></a>
         {% endif %}
-        {% if doc.owner == handler.state.user._id or handler.hasPerm(comment_edit_perm) %}
+        {% if doc.owner == handler.state.user._id or handler.user.hasPerm(comment_edit_perm) %}
           <a href="javascript:;" data-tooltip="{{ _('Edit') }}" name="dczcomments__op-edit-comment"
             data-form="{{ {operation: comment_edit_op, psrid: doc._id}|json }}"
           ><span class="icon icon-edit"></span></a>
         {% endif %}
-        {% if doc.owner == handler.state.user._id or handler.hasPerm(comment_delete_perm) %}
+        {% if doc.owner == handler.state.user._id or handler.user.hasPerm(comment_delete_perm) %}
           <a href="javascript:;" data-tooltip="{{ _('Delete') }}" name="dczcomments__op-delete-comment"
             data-form="{{ {operation: comment_delete_op, psrid: doc._id}|json }}"
           ><span class="icon icon-delete"></span></a>
@@ -145,15 +145,15 @@
                   {{ user.render_inline(udoc, badge=false) }} @ {{ datetimeSpan(rdoc['_id'])|safe }}
                 </div>
                 <div class="dczcomments__operations nojs--hide">
-                {% if handler.hasPerm(reply_post_perm) %}
+                {% if handler.user.hasPerm(reply_post_perm) %}
                   <a href="javascript:;" data-tooltip="{{ _('Reply') }}" name="dczcomments__op-reply-reply"><span class="icon icon-reply"></span></a>
                 {% endif %}
-                {% if doc.owner == handler.state.user._id or handler.hasPerm(reply_edit_perm) %}
+                {% if doc.owner == handler.state.user._id or handler.user.hasPerm(reply_edit_perm) %}
                   <a href="javascript:;" data-tooltip="{{ _('Edit') }}" name="dczcomments__op-edit-reply"
                     data-form="{{ {operation: reply_edit_op, psid: doc._id, psrid: rdoc._id}|json }}"
                   ><span class="icon icon-edit"></span></a>
                 {% endif %}
-                {% if doc.owner == handler.state.user._id or handler.hasPerm(reply_delete_perm) %}
+                {% if doc.owner == handler.state.user._id or handler.user.hasPerm(reply_delete_perm) %}
                   <a href="javascript:;" data-tooltip="{{ _('Delete') }}" name="dczcomments__op-delete-reply"
                     data-form="{{ {operation: reply_delete_op, psid: doc._id, psrid: rdoc._id}|json }}"
                   ><span class="icon icon-delete"></span></a>

templates/components/problem.html

@@ -1,4 +1,4 @@
-{% macro render_problem_title(pdoc, tdoc=none, show_tags=true, show_invisible_flag=true, rp=none, invalid=false) %}
+{% macro render_problem_title(pdoc, tdoc=none, show_tags=true, show_invisible_flag=true, invalid=false) %}
   {%- if not invalid %}
   <a
   {%- if tdoc and tdoc.docType == model.document.TYPE_CONTEST %}
@@ -17,9 +17,6 @@
 {%- if pdoc['hidden'] and show_invisible_flag %}
   <span class="text-orange">({{ _('Hidden') }})</span>
 {%- endif %}
-{%- if not rp is none %}
-  <span class="problem__rp-tag">RP+{{ rp|round|int }}</span>
-{%- endif %}
 {%- if show_tags %}
   {{ render_problem_tags(pdoc) }}
 {%- endif %}
@@ -29,7 +26,7 @@
 {%- if pdoc['tag']|length > 0 %}
   <ul class="problem__tags">
   {%- for tag in pdoc['tag'] %}
-    <li class="problem__tag"><a class="problem__tag-link" href="/p/category/{{ tag }}">{{ tag }}</a></li>
+    <li class="problem__tag"><a class="problem__tag-link" href="{{ url('problem_category', category=tag) }}">{{ tag }}</a></li>
   {%- endfor %}
   </ul>
 {%- else %}

templates/components/record.html

@@ -6,7 +6,7 @@
       {{ model.builtin.STATUS_TEXTS[rdoc['status']] }}
     </a>
   </div>
-{% if rdoc['status'] == status.STATUS_JUDGING %}
+{% if rdoc['status'] == STATUS.STATUS_JUDGING %}
   <div class="col--status__progress-container">
     <div class="col--status__progress" style="width: {{ rdoc['progress']|default(50)|int }}%"></div>
   </div>