copr / copr

Clone

#626 [frontend] don't display url to dist-git logs for non-admin users
Merged 5 years ago by praiskup. Opened 5 years ago by dturecek.
copr/ dturecek/copr hide-distgit-logs  into  master

file modified
+5 -5 
@@ -759,11 +759,11 @@ 
 

      def id_fixed_width(self):
 

          return "{:08d}".format(self.id)
 

  

-     @property
 

-     def import_log_urls(self):
 

-         backend_log = self.import_log_url_backend
 

-         types = [helpers.BuildSourceEnum("upload"), helpers.BuildSourceEnum("link")]
 

-         return filter(None, [backend_log, self.import_log_url_distgit])
 

+     def get_import_log_urls(self, admin=False):
 

+         logs = [self.import_log_url_backend]
 

+         if admin:
 

+             logs.append(self.import_log_url_distgit)
 

+         return list(filter(None, logs))
 

  

      @property
 

      def import_log_url_distgit(self):

file modified
+2 -2 
@@ -161,9 +161,9 @@ 
 

        <div class="panel-body">
 

          <dl class="dl-horizontal">
 

          {{ describe_failure(build) }}
 

-         <dt>Import logs:</dt>
 

+         <dt>Import log:</dt>
 

          <dd>
 

-           {% for url in build.import_log_urls %}
 

+           {% for url in build.get_import_log_urls(g.user.admin) %}
 

              <a href="{{ url }}">{{ url |basename }}</a>
 

              {{ "," if not loop.last }}
 

            {% endfor %}

no initial comment

Can you please return a list generator preferably, or list(filter(...))?

I'd propose to also s/Import logs:/Import log:.

rebased onto 62afaed3f2a00d84c596592e3a17cdf34251df60
5 years ago

I've addressed both your comments.

Thank you, +1

rebased onto f811226
5 years ago

Pull-Request has been merged by praiskup
5 years ago
Metadata
None
No Tags
Changes Summary 2
+5 -5
file changed
frontend/coprs_frontend/coprs/models.py
+2 -2
file changed
frontend/coprs_frontend/coprs/templates/coprs/detail/build.html
Powered by Pagure 5.13.3
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.