Merge branch 'pre_trustie_server' into trustie_server

app/views/admins/organizations/shared/_org_list.html.erb

@@ -27,11 +27,12 @@
           <td><%= link_to org.organization_users_count, "/#{org.login}", target: "_blank" %></td>
           <td><%= link_to org.projects_count, "/#{org.login}", target: "_blank" %></td>
           <td class="action-container">
+            <%= javascript_void_link '开通CLA', class: 'action open-cla-action', data: { id: org.id }, style: org.open_cla? ? 'display: none;' : '' %>
+            <%= javascript_void_link '关闭CLA', class: 'action close-cla-action', data: { id: org.id }, style: org.open_cla? ? '' : 'display: none;' %>  
             <%= link_to '查看', admins_organization_path(org), class: 'action' %>
             <div class="d-inline">
               <%= javascript_void_link('更多', class: 'action dropdown-toggle', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) %>
               <div class="dropdown-menu more-action-dropdown">
-
                 <%= delete_link '删除', admins_organization_path(org, element: ".user-item-#{org.id}"), class: 'dropdown-item delete-user-action' %>
               </div>
             </div>

app/views/admins/organizations/show.html.erb

@@ -28,8 +28,9 @@
       <div class="form-row">
         <%= f.input :lastname, label: '姓名', wrapper_html: { class: 'col-md-3' }, input_html: {  readonly: true, class: 'col-md-11', value: @org.real_name } %>
       </div>
-
-      
+      <div class="form-row">
+          <%= f.input :enabling_cla, as: :boolean, label: '开通CLA', checked_value: 1, unchecked_value: 0 %>
+      </div>
     </div>
   <% end %>
     <h3> 组织项目 </h3>

app/views/organizations/clas/_detail.json.jbuilder

@@ -0,0 +1,6 @@
+json.id cla.id
+json.content cla.content
+json.key cla.key
+json.name cla.name
+json.pr_need cla.pr_need
+json.count cla.count

app/views/organizations/clas/create.json.jbuilder

@@ -0,0 +1 @@
+json.partial! "detail", cla: @cla, organization: @organization

app/views/organizations/clas/index.json.jbuilder

@@ -0,0 +1,3 @@
+if @cla.present?
+    json.partial! "detail", cla: @cla
+end

app/views/organizations/clas/show.json.jbuilder

@@ -0,0 +1,8 @@
+json.partial! "detail", cla: @cla, organization: @organization
+json.is_admin @is_admin
+json.is_sign @is_sign
+json.cla_sign_email @cla_sign_email
+json.is_member @is_member
+json.organization do 
+  json.partial! "organizations/organizations/simple", organization: @organization
+end

app/views/organizations/clas/update.json.jbuilder

@@ -0,0 +1 @@
+json.partial! "detail", cla: @cla, organization: @organization

app/views/organizations/organizations/_detail.json.jbuilder

@@ -16,4 +16,5 @@ json.news_banner_id organization.news_banner_id
 json.news_content organization.news_content
 json.memo organization.memo
 json.news_title organization.news_title
-json.news_url organization.news_url
+json.news_url organization.news_url
+json.enabling_cla organization.enabling_cla

app/views/projects/_detail.json.jbuilder

@@ -3,6 +3,7 @@ json.identifier project.identifier
 json.name project.name
 json.description project.description
 json.is_public project.is_public
+json.pr_need @project.owner&.cla.try(:pr_need)
 json.owner do 
   json.partial! "/users/user_simple", locals: {user: project.owner}
 end

app/views/pull_requests/index.json.jbuilder

@@ -11,6 +11,7 @@ json.project_author @project.owner.try(:login)
 json.project_author_name @project.owner.try(:show_real_name)
 json.has_created_pull_requests @project.pull_requests.size > 0
 json.disable_pr_vew @project.pr_view_admin? && !@project.manager?(current_user)
+json.pr_need @project.owner.class == User ? false : @project.owner&.cla.try(:pr_need)
 
 json.issues do
   json.array! @issues.to_a do |issue|

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

@@ -0,0 +1,11 @@
+json.id user_cla.id
+json.real_name user_cla.real_name
+json.email user_cla.email
+json.state user_cla.state
+json.created_at format_time(user_cla.sign_time)
+json.cla do 
+    json.partial! "/organizations/clas/detail", locals: {cla: user_cla.cla}
+end
+json.organization do 
+    json.partial! "organizations/organizations/simple", organization: user_cla.cla.organization
+  end

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

@@ -0,0 +1,3 @@
+json.user_clas @user_clas do |user_cla|
+  json.partial! "detail", user_cla: user_cla
+end

app/views/users/clas/show.json.jbuilder

@@ -0,0 +1 @@
+json.partial! "detail", user_cla: @user_cla