jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject

This commit is contained in:
huang 2016-11-09 14:43:16 +08:00
parent 8848bfb06f 2b164594f6
commit 36e363c278
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/repositories_controller.rb
View File

@ -87,8 +87,6 @@ class RepositoriesController < ApplicationController
end
def forked
respond_to do |format|
format.html{
@project = Project.find(params[:id])
@repository = Repository.where("project_id =? and type =?", @project.id, "Repository::Gitlab")
# 如果当前用户已经fork过该项目，不会新fork项目，则跳至已fork的项
@ -117,8 +115,6 @@ class RepositoriesController < ApplicationController
end
end
end
}
end
end
# 一键ZIP下载

23
app/views/repositories/_forked_popbox.html.erb
View File

@ -1 +1,22 @@
666
<div style="width:460px;">
<div class="sy_popup_top">
<h3 class="fl">提示</h3>
<a href="javascript:void(0);" class="sy_icons_close fr" onclick="hideModal()"></a>
<div class="cl"></div>
</div>
<div class="sy_popup_con" style="width:380px;">
<ul class="sy_popup_add" >
<li class="center mb5" style="line-height:20px">
Fork将在后台执行<br>平台将为您创建一个新的同名项目和版本库，请问是否继续？
</li>
<li class="mt10">
<label class="mr27">&nbsp;</label>
<a href="javascript:void(0);" class="sy_btn_grey fl " onclick="hideModal()">取&nbsp;&nbsp;消</a>
<!-- <a href="<%#= {:controller => 'repositories', :action => 'forked'} %>" class="sy_btn_blue fl ml20" onclick="hideModal();">确&nbsp;&nbsp;定</a>-->
<%= link_to "确 定", {:controller => 'repositories', :action => 'forked'},
:class=>"sy_btn_blue fl ml20", :onclick=>"hideModal();" %>
<div class="cl"></div>
</li>
</ul>
</div>
</div>