Hjqreturn
/
pgfqe6ch8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

刷新镜像配置页面：

Browse Source
dev_bj
daiao 6 years ago
parent 2fcf391018
commit f8e5a7c89c
3 changed files with 407 additions and 413 deletions
Show Stats Download Patch File Download Diff File

24
app/controllers/shixuns_controller.rb
Unescape View File

@ -818,17 +818,17 @@ class ShixunsController < ApplicationController
end
end
# 自动构建版本库
repository = Repository.new
repository.shixun = @shixun
repository.type = 'Repository::Gitlab'
repository.identifier = @shixun.identifier.downcase
repository.project_id = -1
repository.save!
s = Trustie::Gitlab::Sync.new
gproject = s.create_shixun(@shixun, repository)
raise "版本库创建失败" if @shixun.gpid.blank? # 若和gitlab没同步成功，则抛出异常
g = Gitlab.client
@shixun.update_column(:git_url, g.project(@shixun.gpid).path_with_namespace)
# repository = Repository.new
# repository.shixun = @shixun
# repository.type = 'Repository::Gitlab'
# repository.identifier = @shixun.identifier.downcase
# repository.project_id = -1
# repository.save!
# s = Trustie::Gitlab::Sync.new
# gproject = s.create_shixun(@shixun, repository)
# raise "版本库创建失败" if @shixun.gpid.blank? # 若和gitlab没同步成功，则抛出异常
# g = Gitlab.client
# @shixun.update_column(:git_url, g.project(@shixun.gpid).path_with_namespace)
# g = Gitlab.client
# hook_url = Setting.protocol + "://" + Setting.host_name + "/shixuns/#{@shixun.identifier}" + "/ghook"
# g.add_project_hook(@shixun.gpid, hook_url)
@ -1168,6 +1168,8 @@ class ShixunsController < ApplicationController
@small_type = MirrorRepository.published_small_mirror
@shixun_main_mirror = @shixun.mirror_repositories.published_main_mirror.first
# 权限
logger.info("###########{User.current.admin?}")
logger.info("#########business:##{User.current.business?}")
@power = (@shixun.status < 2 ? true : ( User.current.admin? ? true : false))
# unless @repository.nil?
# gitlab_address = Redmine::Configuration['gitlab_address']

26
app/views/shixuns/_form.html.erb
Unescape View File

@ -37,19 +37,19 @@
</div>
</div>
</div>
<div class="mb10 edu-back-white padding30-20">
<p class="color-grey-6 font-16 mb15">简介</p>
<div class="df mb20">
<div class="flex1 mr20">
<div id="shixun_introduction" class="fl">
<textarea name="shixun[description]"><%= @introduction_sample || @shixun.description %></textarea>
</div>
<p id="e_tip_desc" class="edu-txt-right color-grey-cd font-12"></p>
<p id="e_tips_desc" class="edu-txt-right color-grey-cd font-12"></p>
</div>
<div style="width: 57px;">&nbsp;</div>
</div>
</div>
<!-- <div class="mb10 edu-back-white padding30-20">-->
<!-- <p class="color-grey-6 font-16 mb15">简介</p>-->
<!-- <div class="df mb20">-->
<!-- <div class="flex1 mr20">-->
<!-- <div id="shixun_introduction" class="fl">-->
<!-- <textarea name="shixun[description]"><%#= @introduction_sample || @shixun.description %></textarea>-->
<!-- </div>-->
<!-- <p id="e_tip_desc" class="edu-txt-right color-grey-cd font-12"></p>-->
<!-- <p id="e_tips_desc" class="edu-txt-right color-grey-cd font-12"></p>-->
<!-- </div>-->
<!-- <div style="width: 57px;">&nbsp;</div>-->
<!-- </div>-->
<!-- </div>-->
<div class="mb10 edu-back-white padding30-20">
<p class="color-grey-6 font-16 mb15">技术平台</p>
<div class="clearfix mb20">

58
app/views/shixuns/_settings_edit.html.erb
Unescape View File

@ -33,19 +33,19 @@
</div>
</div>
<div class="mb10 edu-back-white padding40-20">
<p class="color-grey-6 font-16 mb30">简介</p>
<div class="df mb20">
<div class="flex1 mr20">
<div id="setting_introduction" class="fl">
<textarea name="shixun[description]"><%= @shixun.description %></textarea>
</div>
<p id="e_tip_in" class="edu-txt-right color-grey-cd font-12"></p>
<p id="e_tips_in" class="edu-txt-right color-grey-cd font-12"></p>
</div>
<div style="width: 57px;">&nbsp;</div>
</div>
</div>
<!-- <div class="mb10 edu-back-white padding40-20">-->
<!-- <p class="color-grey-6 font-16 mb30">简介</p>-->
<!-- <div class="df mb20">-->
<!-- <div class="flex1 mr20">-->
<!-- <div id="setting_introduction" class="fl">-->
<!-- <textarea name="shixun[description]"><%#= @shixun.description %></textarea>-->
<!-- </div>-->
<!-- <p id="e_tip_in" class="edu-txt-right color-grey-cd font-12"></p>-->
<!-- <p id="e_tips_in" class="edu-txt-right color-grey-cd font-12"></p>-->
<!-- </div>-->
<!-- <div style="width: 57px;">&nbsp;</div>-->
<!-- </div>-->
<!-- </div>-->
<div class="mb10 edu-back-white padding40-20">
<div class="clearfix mb20">
@ -294,8 +294,7 @@
</div>
</div>
<% end %>
<% if User.current.admin? || User.current.business? %>
<div class=<%User.current.admin? || User.current.business? ? "edu-back-white padding40-20 mb20":"none" %> >
<div class="edu-back-white padding40-20 mb20">
<p class="color-grey-6 font-16 mb30">服务配置</p>
<% @shixun.shixun_service_configs.each do |config| %>
<p class="color-grey-6 font-16 mt30" id="shixun_scenario_type_name"><%= config.mirror_repository.try(:type_name) %></p>
@ -303,8 +302,7 @@
<div class="clearfix mb5">
<label class="panel-form-label fl">CPU(核)：</label>
<div class="pr fl with80 status_con">
<input type="text" name="cpu_limit[]" value="<%= config.cpu_limit %>" class="panel-box-sizing task-form-100 task-height-40"
>
<input type="text" <%= User.current.admin? ? "" : "readonly" %> name="cpu_limit[]" value="<%= config.cpu_limit %>" class="panel-box-sizing task-form-100 task-height-40"
placeholder="请输入类别名称"/>
</div>
<div class="cl"></div>
@ -312,8 +310,7 @@
<div class="clearfix mb5">
<label class="panel-form-label fl">最低CPU(核)：</label>
<div class="pr fl with80 status_con">
<input type="text" name="lower_cpu_limit[]" value="<%= config.lower_cpu_limit %>" class="panel-box-sizing task-form-100 task-height-40"
>
<input type="text" name="lower_cpu_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="<%= config.lower_cpu_limit %>" class="panel-box-sizing task-form-100 task-height-40"
placeholder="请输入类别名称"/>
</div>
<div class="cl"></div>
@ -321,8 +318,7 @@
<div class="clearfix mb5">
<label class="panel-form-label fl">内存限制(M)：</label>
<div class="pr fl with80 status_con">
<input type="text" name="memory_limit[]" value="<%= config.memory_limit %>" class="panel-box-sizing task-form-100 task-height-40"
>
<input type="text" name="memory_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="<%= config.memory_limit %>" class="panel-box-sizing task-form-100 task-height-40"
placeholder="请输入类别名称"/>
</div>
<div class="cl"></div>
@ -330,8 +326,7 @@
<div class="clearfix mb5">
<label class="panel-form-label fl">内存要求(M)：</label>
<div class="pr fl with20 status_con">
<input type="text" name="request_limit[]" value="<%= config.request_limit %>" class="panel-box-sizing task-form-100 task-height-40"
>
<input type="text" name="request_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="<%= config.request_limit %>" class="panel-box-sizing task-form-100 task-height-40"
placeholder="请输入类别名称"/>
</div>
<label class="panel-form-label fl" style="width: 48%">温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>
@ -351,7 +346,6 @@
<div id='result'></div>
</div>
<% end %>
<div class="clearfix mt30">
<a href="javascript:void(0)" class="defalutSubmitbtn fl mr20" onclick="submit_edit_shixun(<%= @shixun.id %>);">保存</a>
<%= link_to "取消", settings_shixun_path(@shixun), :class => "defalutCancelbtn fl" %>
@ -364,7 +358,9 @@
<script id="t:edit-setting-list" type="text/html">
<!if(list.length>0) { !>
<!for(var i=0;i<list.length;i++){!>
<!for(var i=0;i
<list.length
;i++){!>
<p class="color-grey-6 font-16 mt30" id="shixun_scenario_type_name">
<!=listname[i]!>
@ -373,8 +369,7 @@
<div class="clearfix mb5">
<label class="panel-form-label fl">CPU(核)：</label>
<div class="pr fl with80 status_con">
<input type="text" name="cpu_limit[]" value="1" class="panel-box-sizing task-form-100 task-height-40"
>
<input type="text" name="cpu_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="1" class="panel-box-sizing task-form-100 task-height-40"
placeholder="请输入类别名称"/>
</div>
<div class="cl"></div>
@ -382,8 +377,7 @@
<div class="clearfix mb5">
<label class="panel-form-label fl">最低CPU(核)：</label>
<div class="pr fl with80 status_con">
<input type="text" name="lower_cpu_limit[]" value="0.1" class="panel-box-sizing task-form-100 task-height-40"
>
<input type="text" name="lower_cpu_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="0.1" class="panel-box-sizing task-form-100 task-height-40"
placeholder="请输入类别名称"/>
</div>
<div class="cl"></div>
@ -391,8 +385,7 @@
<div class="clearfix mb5">
<label class="panel-form-label fl">内存限制(M)：</label>
<div class="pr fl with80 status_con">
<input type="text" name="memory_limit[]" value="1024" class="panel-box-sizing task-form-100 task-height-40"
>
<input type="text" name="memory_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="1024" class="panel-box-sizing task-form-100 task-height-40"
placeholder="请输入类别名称"/>
</div>
<div class="cl"></div>
@ -400,8 +393,7 @@
<div class="clearfix mb5">
<label class="panel-form-label fl">内存要求(M)：</label>
<div class="pr fl with20 status_con">
<input type="text" name="request_limit[]" value="10" class="panel-box-sizing task-form-100 task-height-40"
>
<input type="text" name="request_limit[]" <%= User.current.admin? ? "" : "readonly" %> value="10" class="panel-box-sizing task-form-100 task-height-40"
placeholder="请输入类别名称"/>
</div>
<label class="panel-form-label fl" style="width: 48%">温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>

Write Preview
Loading…
Cancel
Save