Show placeholder page for private accounts (#1912)

* For private profile show just the header * Remove print statments * Remove role check * User profile check not required * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Fix org url in the dropdown menu --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
hasgeek · Nov 7, 2023 · 4e2cd1b · 4e2cd1b
1 parent becda18
commit 4e2cd1b
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 34 deletions.
diff --git a/funnel/templates/account_menu.html.jinja2 b/funnel/templates/account_menu.html.jinja2
@@ -36,7 +36,7 @@
       </li>
       {%- for orgmem in orgmemlist.recent %}
         <li>
-          <a href="{{ orgmem.account.profile_url }}"
+          <a href="{{ orgmem.account.url_for() }}"
              class="header__dropdown__item header__dropdown__item--flex header__dropdown__item--morepadding mui--text-dark nounderline">
             <span class="profile-avatar margin-right">
               {%- if orgmem.account.logo_url.url %}

diff --git a/funnel/templates/profile_layout.html.jinja2 b/funnel/templates/profile_layout.html.jinja2
@@ -426,10 +426,10 @@
           {% if profile.is_organization_profile %}
             <a class="sub-navbar__item mui--text-subhead mui--text-dark mui--hidden-xs mui--hidden-sm {% if current_page == 'profile' %}sub-navbar__item--active{%- endif %}" href="{%- if current_page != 'profile' -%}{{ profile.url_for() }}{%- endif %}" data-cy-navbar="profile">{% trans %}Home{% endtrans %}</a>
             <a class="sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'admins' %}sub-navbar__item--active{%- endif %}" href="{%- if current_page != 'admins' -%}{{ profile.urls['members'] }}{%- endif %}" data-cy-navbar="admins">{% trans %}Admins{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
-          {% else %}
-          <a class="sub-navbar__item mui--text-subhead mui--text-dark mui--hidden-xs mui--hidden-sm {% if current_page == 'profile' %}sub-navbar__item--active{%- endif %}" href="{{ profile.url_for() }}">{% trans %}Sessions{% endtrans %}</a>
-          <a class="sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'projects' %}sub-navbar__item--active{%- endif %}" href="{{ profile.url_for('user_participated_projects') }}">{% trans %}Projects{% endtrans %}<span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
-          <a class="sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'submissions' %}sub-navbar__item--active{%- endif %}" href="{{ profile.url_for('user_proposals') }}" data-cy="submissions">{% trans %}Submissions{% endtrans %}<span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
+          {% elif not profile.features.is_private() %}
+            <a class="sub-navbar__item mui--text-subhead mui--text-dark mui--hidden-xs mui--hidden-sm {% if current_page == 'profile' %}sub-navbar__item--active{%- endif %}" href="{{ profile.url_for() }}">{% trans %}Sessions{% endtrans %}</a>
+            <a class="sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'projects' %}sub-navbar__item--active{%- endif %}" href="{{ profile.url_for('user_participated_projects') }}">{% trans %}Projects{% endtrans %}<span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
+            <a class="sub-navbar__item mui--text-subhead mui--text-dark {% if current_page == 'submissions' %}sub-navbar__item--active{%- endif %}" href="{{ profile.url_for('user_proposals') }}" data-cy="submissions">{% trans %}Submissions{% endtrans %}<span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
           {% endif %}
         </nav>
       </div>

diff --git a/funnel/templates/user_profile.html.jinja2 b/funnel/templates/user_profile.html.jinja2
@@ -35,18 +35,22 @@
     <div class="mui-container">
       <div class="page-content">
         {% block contentwrapper %}
-          <div class="grid projects-wrapper" id="tagged-sessions">
-            <div class="grid__col-xs-12">
-              {% if not tagged_sessions %}
-                <p class="mui-panel bg-accent">{% trans %}No tagged sessions yet{% endtrans %}</p>
-              {% endif %}
-            </div>
-            {% for session in tagged_sessions %}
-              <div class="grid__col-xs-12 grid__col-sm-6 grid__col-sm-4">
-                {{ video_thumbnail(session) }}
+          {% if profile.features.is_private() %}
+            <p class="mui-panel bg-accent">{% trans %}This is a private account{% endtrans %}</p>
+          {% else %}
+            <div class="grid projects-wrapper" id="tagged-sessions">
+              <div class="grid__col-xs-12">
+                {% if not tagged_sessions %}
+                  <p class="mui-panel bg-accent">{% trans %}No tagged sessions yet{% endtrans %}</p>
+                {% endif %}
               </div>
-            {% endfor %}
-          </div>
+              {% for session in tagged_sessions %}
+                <div class="grid__col-xs-12 grid__col-sm-6 grid__col-sm-4">
+                  {{ video_thumbnail(session) }}
+                </div>
+              {% endfor %}
+            </div>
+          {% endif %}
         {% endblock contentwrapper %}
       </div>
     </div>

diff --git a/funnel/templates/user_profile_projects.html.jinja2 b/funnel/templates/user_profile_projects.html.jinja2
@@ -8,18 +8,24 @@
 
 {% block contentwrapper %}
   <div class="grid projects-wrapper" id="tagged-projects">
-    <div class="grid__col-xs-12">
-      {% if not participated_projects %}
-        <p class="mui-panel bg-accent">{% trans %}No participation yet{% endtrans %}</p>
-      {% endif %}
-    </div>
-    <ul class="mui-list--unstyled grid upcoming" role="list">
-      {% for project in participated_projects %}
-        <li class="grid__col-xs-12 grid__col-sm-6 grid__col-lg-4" role="listitem">
-          {{ projectcard(project, include_calendar=true, calendarwidget_compact=false) }}
-        </li>
-      {%- endfor -%}
-    </ul>
+    {% if profile.features.is_private() %}
+      <div class="grid__col-xs-12">
+        <p class="mui-panel bg-accent">{% trans %}This is a private account{% endtrans %}</p>
+       </div>
+    {% else %}
+      <div class="grid__col-xs-12">
+        {% if not participated_projects %}
+          <p class="mui-panel bg-accent">{% trans %}No participation yet{% endtrans %}</p>
+        {% endif %}
+      </div>
+      <ul class="mui-list--unstyled grid upcoming" role="list">
+        {% for project in participated_projects %}
+          <li class="grid__col-xs-12 grid__col-sm-6 grid__col-lg-4" role="listitem">
+            {{ projectcard(project, include_calendar=true, calendarwidget_compact=false) }}
+          </li>
+        {%- endfor -%}
+      </ul>
+    {% endif %}
   </div>
 {% endblock contentwrapper %}
 

diff --git a/funnel/templates/user_profile_proposals.html.jinja2 b/funnel/templates/user_profile_proposals.html.jinja2
@@ -9,10 +9,14 @@
 {% block contentwrapper %}
   <div class="grid projects-wrapper" id="tagged-submissions">
     <div class="grid__col-xs-12">
-      {% if submitted_proposals %}
-        {{ proposal_list(submitted_proposals) }}
+      {% if profile.features.is_private() %}
+        <p class="mui-panel bg-accent">{% trans %}This is a private account{% endtrans %}</p>
       {% else %}
-        <p class="mui-panel bg-accent">{% trans %}No submissions{% endtrans %}</p>
+          {% if submitted_proposals %}
+            {{ proposal_list(submitted_proposals) }}
+          {% else %}
+            <p class="mui-panel bg-accent">{% trans %}No submissions{% endtrans %}</p>
+          {% endif %}
       {% endif %}
     </div>
   </div>

diff --git a/funnel/views/profile.py b/funnel/views/profile.py
@@ -62,6 +62,11 @@ def feature_profile_make_private(obj: Account):
     return obj.current_roles.admin and obj.make_profile_private.is_available
 
 
+@Account.features('is_private')
+def feature_profile_is_private(obj: Account):
+    return not obj.current_roles.admin and not bool(obj.profile_state.ACTIVE_AND_PUBLIC)
+
+
 def template_switcher(templateargs):
     template = templateargs.pop('template')
     return render_template(template, **templateargs)
@@ -72,7 +77,6 @@ def template_switcher(templateargs):
 class ProfileView(AccountViewMixin, UrlChangeCheck, UrlForView, ModelView):
     @route('', endpoint='profile')
     @render_with({'text/html': template_switcher}, json=True)
-    @requires_roles({'reader', 'admin'})
     def view(self) -> ReturnRenderWith:
         template_name = None
         ctx = {}
@@ -240,7 +244,6 @@ def view(self) -> ReturnRenderWith:
 
     @route('in/projects')
     @render_with('user_profile_projects.html.jinja2', json=True)
-    @requires_roles({'reader', 'admin'})
     def user_participated_projects(self) -> ReturnRenderWith:
         if self.obj.is_organization_profile:
             abort(404)
@@ -260,7 +263,6 @@ def user_participated_projects(self) -> ReturnRenderWith:
     @route('in/submissions')
     @route('in/proposals')  # Legacy route, will be auto-redirected to `in/submissions`
     @render_with('user_profile_proposals.html.jinja2', json=True)
-    @requires_roles({'reader', 'admin'})
     def user_proposals(self) -> ReturnRenderWith:
         if self.obj.is_organization_profile:
             abort(404)