Do not show normal users the admin tools

openSUSE · May 30, 2024 · 09769a3 · 09769a3
1 parent fb75250
commit 09769a3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/assets/vue/EditSnippet.vue b/assets/vue/EditSnippet.vue
@@ -125,9 +125,7 @@
         <div class="col mb-3">
           <button name="create-pattern" type="submit" value="1" class="btn btn-primary mb-2">Create Pattern</button
           >&nbsp;
-          <button name="mark-non-license" type="submit" value="1" class="btn btn-danger mb-2">
-            Mark as Non-License
-          </button>
+          <button name="propose-pattern" type="submit" value="1" class="btn btn-secondary mb-2">Propose Pattern</button>
         </div>
       </div>
       <div v-if="closest !== null" class="row closest-container">

diff --git a/lib/Cavil/Controller/Report.pm b/lib/Cavil/Controller/Report.pm
@@ -66,7 +66,8 @@ sub source ($self) {
         filename => $source->{filename},
         lines    => lines_context($source->{lines}),
         hidden   => 0,
-        packname => $source->{name}
+        packname => $source->{name},
+        is_admin => $self->current_user_has_role('admin')
       );
     }
   );

diff --git a/lib/Cavil/Plugin/Helpers.pm b/lib/Cavil/Plugin/Helpers.pm
@@ -81,9 +81,9 @@ sub _checksum ($c, $specfile, $report) {
 
 sub _current_user ($c) { $c->session('user') }
 
-sub _current_user_has_role ($c, $role) {
+sub _current_user_has_role ($c, @roles) {
   return undef unless my $user = $c->helpers->current_user;
-  return $c->users->has_role($user, $role);
+  return $c->users->has_role($user, @roles);
 }
 
 sub _current_user_roles ($c) {

diff --git a/templates/reviewer/file_source.html.ep b/templates/reviewer/file_source.html.ep
@@ -17,7 +17,7 @@
         % else {
           <tr class="<%= $class %>">
         % }
-          % if ($line->[1]->{end}) {
+          % if ($is_admin && $line->[1]->{end}) {
             % my $end_id = "$file-$i";
             % my $data = { start => $line->[0], end => $line->[1]->{end}, 'prev-match' => $line->[1]->{prevstart} // 0, 'next-match' => $line->[1]->{nextend} // 0 };
             %= tag 'td', class => "actions dropdown show" => data => $data => begin

diff --git a/templates/reviewer/report.html.ep b/templates/reviewer/report.html.ep
@@ -115,6 +115,7 @@
 
   <h2>Files</h2>
 
+  % my $is_admin = current_user_has_role 'admin';
   % for my $file (@{$report->{files}}) {
     % my $id = $file->{id};
     % next unless defined $linked_files{$id};
@@ -136,7 +137,7 @@
       </div>
       % if ($file->{expand}) {
         <%= include 'reviewer/file_source', file => $id, filename => $path, lines => $file->{lines},
-                     packname => $package->{name} %>
+                     packname => $package->{name}, is_admin => $is_admin %>
       % }
       % else {
         <div id="file-details-<%= $id %>" class="source" data-file-id="<%= $id %>"></div>