core: fix owner display on problem & contest (#614)

packages/hydrooj/src/handler/discussion.ts

@@ -173,6 +173,7 @@ class DiscussionDetailHandler extends DiscussionHandler {
             system.get('pagination.reply'),
         );
         const uids = [
+            ...this.vnode.owner ? [this.vnode.owner] : [],
             this.ddoc.owner,
             ...drdocs.map((drdoc) => drdoc.owner),
         ];

packages/hydrooj/src/handler/problem.ts

@@ -376,6 +376,7 @@ export class ProblemDetailHandler extends ContestDetailBaseHandler {
             solutionCount: scnt,
             discussionCount: dcnt,
             tdoc: this.tdoc,
+            owner_udoc: (tid && this.tdoc.owner !== this.pdoc.owner) ? await user.getById(domainId, this.tdoc.owner) : null,
         };
         if (this.tdoc && this.tsdoc) {
             const fields = ['attend', 'startAt'];

packages/ui-default/templates/contest_user.html

@@ -41,7 +41,7 @@
   </div>
   <div class="medium-3 columns">
   {% set owner_udoc = udict[tdoc.owner] %}
-  {% include "partials/contest_sidebar.html" %}
+  {% include "partials/contest_sidebar_management.html" %}
   </div>
 </div>
 {% endblock %}

packages/ui-default/templates/partials/problem_sidebar.html

@@ -1,7 +1,7 @@
+{% if not owner_udoc %}
+  {% set owner_udoc = udoc %}
+{% endif %}
 {% if tdoc %}
-  {% if not owner_udoc %}
-    {% set owner_udoc = udoc %}
-  {% endif %}
   {% if tdoc.rule == 'homework' %}
     {% include "partials/problem_sidebar_homework.html" %}
     {% include "partials/homework_sidebar.html" %}

packages/ui-default/templates/problem_config.html

@@ -32,7 +32,6 @@
       {% set filetype = "testdata" %}
       {% include "partials/problem_files.html" %}
     </div>
-    {% set owner_udoc = udoc %}
     {% include "partials/problem_sidebar.html" %}
   </div>
 </div>

packages/ui-default/templates/problem_detail.html

@@ -111,7 +111,6 @@
     </div>
   </div>
   <div class="medium-3 columns"><div data-sticky="large">
-    {% set owner_udoc = udoc %}
     {% include "partials/problem_sidebar.html" %}
   </div></div>
 </div>

packages/ui-default/templates/problem_edit.html

@@ -110,7 +110,6 @@
         {% set filetype = "additional_file" %}
         {% include "partials/problem_files.html" %}
       </div>
-      {% set owner_udoc = udoc %}
       {% include "partials/problem_sidebar.html" %}
     {% else %}
       {% include 'components/md_hint.html' %}

packages/ui-default/templates/problem_files.html

@@ -48,7 +48,6 @@
     </div>
   </div>
   <div class="medium-3 columns">
-    {% set owner_udoc = udoc %}
     {% include "partials/problem_sidebar.html" %}
   </div>
 </div>

packages/ui-default/templates/problem_hack.html

@@ -24,7 +24,6 @@
     </div>
   </div>
   <div class="medium-3 columns">
-    {% set owner_udoc = udoc %}
     {% include "partials/problem_sidebar.html" %}
   </div>
 </div>

packages/ui-default/templates/problem_submit.html

@@ -33,7 +33,6 @@
     </div>
   </div>
   <div class="medium-3 columns">
-    {% set owner_udoc = udoc %}
     {% include "partials/problem_sidebar.html" %}
   </div>
 </div>