From 95a355b87c85efa633931fa2c75ede2a661a1e65 Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Mon, 26 Apr 2021 16:45:26 +0800
Subject: [PATCH 1/2] FIX admin projects api bug

---
 app/views/admins/projects/shared/_list.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admins/projects/shared/_list.html.erb b/app/views/admins/projects/shared/_list.html.erb
index bd6300283..fe8d96e9d 100644
--- a/app/views/admins/projects/shared/_list.html.erb
+++ b/app/views/admins/projects/shared/_list.html.erb
@@ -23,7 +23,7 @@
       <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
       <td><%= project.id %></td>
       <td class="text-left">
-        <%= link_to(project.name, "/projects/#{project.id}", target: '_blank') %>
+        <%= link_to(project.name, "/projects/#{project&.owner&.login}/#{project.identifier}", target: '_blank') %>
       </td>
       <td><%= project.is_public ? '√' : '' %></td>
       <td><%= project.issues.size %></td>
@@ -33,7 +33,7 @@
       <td><%= project.versions.size %></td>
       <td><%= project.members.size %></td>
       <td>
-        <%= project.owner ? link_to(project.owner&.real_name, "/users/#{project.owner&.login}", target: '_blank') : "" %>
+        <%= link_to_project(project) %>
       </td>
       <td><%= project.created_on&.strftime('%Y-%m-%d %H:%M') %></td>
       <td class="action-container">

From 1a22491e36af66c80b6dfe7502ca1ad20834433f Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Mon, 26 Apr 2021 16:45:58 +0800
Subject: [PATCH 2/2] ADD admin role to org api

---
 app/controllers/organizations/base_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/organizations/base_controller.rb b/app/controllers/organizations/base_controller.rb
index e6163bf8c..e18ab9aef 100644
--- a/app/controllers/organizations/base_controller.rb
+++ b/app/controllers/organizations/base_controller.rb
@@ -17,6 +17,7 @@ class Organizations::BaseController < ApplicationController
   end
 
   def org_privacy_condition
+    return false if current_user.admin?
     @organization.organization_extension.privacy? && @organization.organization_users.where(user_id: current_user.id).blank?
   end