Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie

app/views/repositories/entries.json.jbuilder

@@ -5,6 +5,9 @@ json.last_commit do
     json.nil!
   end
 end
+json.tags_count @tags_count
+json.branches_count @branches_count
+json.commits_count @commits_count
 json.zip_url render_zip_url(@project, @ref)
 json.tar_url render_tar_url(@project, @ref)
 json.entries do

app/views/repositories/show.json.jbuilder

@@ -1,7 +1,7 @@
 json.identifier @project.identifier
 json.name @project.name
 json.project_id @project.id
-json.repo_id @project.repository.id
+json.repo_id @repo.id
 json.issues_count @project.issues_count.to_i - @project.pull_requests_count.to_i
 json.pull_requests_count @project.pull_requests_count
 json.project_identifier @project.identifier
@@ -12,14 +12,17 @@ json.versions_count @project.versions_count  #里程碑数量
 json.version_releases_count @project.releases_size(@user.try(:id), "all")
 json.version_releasesed_count @project.releases_size(@user.try(:id), "released")  #已发行的版本
 json.contributor_users_count @project.contributor_users
-json.issue_tags_count @tags_count
-json.branches_count @branches_count
-json.commits_count @commits_count
 json.permission  @project.get_premission(@user)
 json.mirror_url @project&.repository.mirror_url
 json.mirror @project&.repository.mirror_url.present?
 json.type @project.numerical_for_project_type
-json.mirror_status @project.repository&.mirror&.numerical_for_status if @project.sync_mirror?
+
+unless @project.common?
+  json.mirror_status @repo.mirror_status
+  json.mirror_num @repo.mirror_num
+  json.first_sync @repo.first_sync?
+end
+
 json.watched @project.watched_by? @user
 json.praised @project.praised_by? @user
 json.status @project.status
@@ -32,12 +35,14 @@ json.fork_info do
   end
 end
 
-json.size replace_bytes_to_b(number_to_human_size(@result['size'].to_i*1024))
-json.ssh_url @result['ssh_url']
-json.clone_url @result['clone_url']
-json.default_branch @result['default_branch']
-json.empty @result['empty']
-json.full_name @result['full_name']
+if @result
+  json.size replace_bytes_to_b(number_to_human_size(@result['size'].to_i*1024))
+  json.ssh_url @result['ssh_url']
+  json.clone_url @result['clone_url']
+  json.default_branch @result['default_branch']
+  json.empty @result['empty']
+  json.full_name @result['full_name']
+  json.private @result['private']
+end
 
-json.private @result['private']
 json.partial! 'author', locals: { user: @project.owner }

app/views/repositories/sub_entries.json.jbuilder

@@ -6,6 +6,9 @@ json.last_commit do
     json.nil!
   end
 end
+json.tags_count @tags_count
+json.branches_count @branches_count
+json.commits_count @commits_count
 json.entries do
   json.array! @sub_entries do |entry|
     json.partial! 'repositories/simple_entry', locals: { entry: entry }