Merge branch 'develop' into dev_trustie_server

app/views/admins/shared/_sidebar.html.erb

@@ -42,8 +42,11 @@
       <% end %>
     </li>
     <li>
-    <%= sidebar_item('/admins/sidekiq', '定时任务', icon: 'bell', controller: 'root') %>
+      <%= sidebar_item('/admins/sidekiq', '定时任务', icon: 'bell', controller: 'root') %>
     </li>
+    
+    <%= render_admin_statistics_item %>
+
     <li><%= sidebar_item('/', '返回主站', icon: 'sign-out', controller: 'root') %></li>
   </ul>
 </nav>

app/views/applied_projects/_detail.json.jbuilder

@@ -0,0 +1,19 @@
+project = object.project
+json.project do 
+  json.id project.id
+  json.identifier project.identifier
+  json.name project.name
+  json.description project.description
+  json.is_public project.is_public
+  json.owner do 
+    json.partial! "/users/user_simple", locals: {user: project.owner}
+  end
+end
+json.user do 
+  json.partial! "/users/user_simple", locals: {user: object.user}
+end
+json.id object.id
+json.status object.status
+json.role object.role
+json.created_at format_time(object.created_at)
+json.time_ago time_from_now(object.created_at)

app/views/applied_projects/create.json.jbuilder

@@ -0,0 +1 @@
+json.partial! "detail", locals: {object: @applied_project}

app/views/repositories/detail.json.jbuilder

@@ -7,12 +7,13 @@ else
   json.readme @result[:readme].merge(content: readme_render_decode64_content(@result[:readme]["content"], nil))
 end
 json.identifier render_identifier(@project)
+json.invite_code @project.invite_code
 json.name @project.name
 json.description  @project.description
 json.project_id @project.id
 json.repo_id @repository.id
 json.issues_count @project.issues_count.to_i - @project.pull_requests_count.to_i
-json.pull_requests_count @project.pull_requests_count
+json.pull_requests_count @project.pull_requests_count 
 json.project_identifier render_identifier(@project)
 json.praises_count @project.praises_count.to_i
 json.forked_count @project.forked_count.to_i

app/views/users/applied_messages/_detail.json.jbuilder

@@ -13,7 +13,12 @@
 #   json.partial! "/users/user_simple", locals: {user: object.user}
 # end
 json.applied do 
-  json.partial! "/projects/applied_transfer_projects/detail", locals: {object: object.applied}
+  case object.applied_type 
+  when 'AppliedTransferProject'
+    json.partial! "/projects/applied_transfer_projects/detail", locals: {object: object.applied}
+  when 'AppliedProject'
+    json.partial! "/applied_projects/detail", locals: {object: object.applied}
+  end
 end
 json.applied_user do 
   json.partial! "/users/user_simple", locals: {user: object.applied_user}

app/views/users/applied_projects/accept.json.jbuilder

@@ -0,0 +1 @@
+json.partial! "/applied_projects/detail", locals: {object: @applied_project}

app/views/users/applied_projects/index.json.jbuilder

@@ -0,0 +1,4 @@
+json.total_count @applied_projects.total_count
+json.applied_projects @applied_projects do |apply|
+  json.partial! "/applied_projects/detail", locals: {object: apply}
+end

app/views/users/applied_projects/refuse.json.jbuilder

@@ -0,0 +1 @@
+json.partial! "/applied_projects/detail", locals: {object: @applied_project}

app/views/users/show.json.jbuilder

@@ -1,6 +1,7 @@
 json.partial! 'users/user', locals: { user: @user }
 json.undo_messages @waiting_applied_messages.size 
 json.undo_transfer_projects @common_applied_transfer_projects.size
+json.undo_join_projects @common_applied_projects.size
 json.undo_events @undo_events
 json.user_composes_count @user_composes_count
 json.user_org_count @user_org_count