Merge branches 'dev_aliyun' and 'jupyter' of https://bdgit.educoder.net/Hjqreturn/educoder into jupyter

app/controllers/admins/shixun_settings_controller.rb

@@ -15,7 +15,8 @@ class Admins::ShixunSettingsController < Admins::BaseController
       hidden: params[:hidden].present? ? params[:hidden] : false,
       homepage_show: params[:homepage_show].present? ? params[:homepage_show] : false,
       task_pass: params[:task_pass].present? ? params[:task_pass] : false,
-      code_hidden: params[:code_hidden].present? ? params[:code_hidden] : false
+      code_hidden: params[:code_hidden].present? ? params[:code_hidden] : false,
+      vip: params[:vip].present? ? params[:vip] : false
     }
 
     @shixuns_type_check = MirrorRepository.pluck(:type_name,:id)
@@ -126,6 +127,6 @@ class Admins::ShixunSettingsController < Admins::BaseController
   end
 
   def setting_params
-    params.permit(:use_scope,:excute_time,:close,:status,:can_copy,:webssh,:hidden,:homepage_show,:task_pass,:code_hidden,:page_no, :id,tag_repertoires:[])
+    params.permit(:use_scope,:excute_time,:close,:status,:can_copy,:webssh,:hidden,:homepage_show,:task_pass,:code_hidden,:vip,:page_no,:id,tag_repertoires:[])
   end
 end

app/queries/admins/shixun_settings_query.rb

@@ -51,6 +51,7 @@ class Admins::ShixunSettingsQuery < ApplicationQuery
     all_shixuns = all_shixuns.where(homepage_show: params[:homepage_show]) if params[:homepage_show]
     all_shixuns = all_shixuns.where(task_pass: params[:task_pass]) if params[:task_pass]
     all_shixuns = all_shixuns.where(code_hidden: params[:code_hidden]) if params[:code_hidden]
+    all_shixuns = all_shixuns.where(vip: params[:vip]) if params[:vip]
 
     custom_sort(all_shixuns, params[:sort_by], params[:sort_direction])
   end

app/views/admins/shixun_settings/index.html.erb

@@ -65,6 +65,12 @@
             <span class="only_view">只看已隐藏文件目录</span>
           </label>
         </div>
+        <div class="mr-5">
+          <label for="vip">
+            <%= check_box_tag :vip, !@sort_json[:vip],@sort_json[:vip], class:"shixun-settings-select" %>
+            <span class="only_view">只看vip</span>
+          </label>
+        </div>
       </div>
     </div>
   <% end %>

app/views/admins/shixun_settings/shared/_list.html.erb

@@ -15,7 +15,7 @@
   <th>
     操作
     <div class="setting-chosen">
-      ssh/隐藏/首页/跳关/隐藏目录
+      ssh/隐藏/首页/跳关/隐藏目录/vip
     </div>
   </th>
   </thead>

app/views/admins/shixun_settings/shared/_td.html.erb

@@ -48,6 +48,7 @@
   <%= check_box_tag :homepage_show,!shixun.homepage_show,shixun.homepage_show,remote:true,data:{id:shixun.id,toggle:"tooltip",placement:"top"},class:"shixun-setting-form",title:"首页" %>
   <%= check_box_tag :task_pass,!shixun.task_pass,shixun.task_pass,remote:true,data:{id:shixun.id,toggle:"tooltip",placement:"top"},class:"shixun-setting-form" ,title:"跳关"%>
   <%= check_box_tag :code_hidden,!shixun.code_hidden,shixun.code_hidden,remote:true,data:{id:shixun.id,toggle:"tooltip",placement:"top"},class:"shixun-setting-form" ,title:"隐藏目录"%>
+  <%= check_box_tag :vip,!shixun.vip,shixun.vip,remote:true,data:{id:shixun.id,toggle:"tooltip",placement:"top"},class:"shixun-setting-form" ,title:"vip"%>
 </td>
 
 <script>

db/migrate/20191210084737_add_vip_to_shixun.rb

@@ -0,0 +1,5 @@
+class AddVipToShixun < ActiveRecord::Migration[5.2]
+  def change
+    add_column :shixuns, :vip, :boolean, default: 0
+  end
+end