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

Merge branch 'szzh' into develop

This commit is contained in:
huang 2015-07-21 14:07:36 +08:00
parent 803b2b4fff b05478e71d
commit 900e8c83b3
6 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/attachments_controller.rb
View File

@ -514,6 +514,8 @@ private
end end
def has_login def has_login
render_403 unless User.current.logged? unless @attachment.container_type == "PhoneAppVersion"
render_403 unless User.current.logged?
end
end end
end end

5
app/helpers/application_helper.rb
View File

@ -1824,7 +1824,9 @@ module ApplicationHelper
def attachment_candown attachment def attachment_candown attachment
candown = false candown = false
if attachment.container if attachment.container
if attachment.container.class.to_s != "HomeworkAttach" && attachment.container.class.to_s != "StudentWork" && (attachment.container.has_attribute?(:project) || attachment.container.has_attribute?(:project_id)) && attachment.container.project if attachment.container.class.to_s=="PhoneAppVersion"
candown = true
elsif attachment.container.class.to_s != "HomeworkAttach" && attachment.container.class.to_s != "StudentWork" && (attachment.container.has_attribute?(:project) || attachment.container.has_attribute?(:project_id)) && attachment.container.project
project = attachment.container.project project = attachment.container.project
candown= User.current.member_of?(project) || (project.is_public && attachment.is_public == 1) candown= User.current.member_of?(project) || (project.is_public && attachment.is_public == 1)
elsif attachment.container.is_a?(Project) elsif attachment.container.is_a?(Project)
@ -1850,6 +1852,7 @@ module ApplicationHelper
candown = true candown = true
elsif attachment.container.class.to_s=="StudentWork" elsif attachment.container.class.to_s=="StudentWork"
candown = true candown = true
elsif attachment.container_type == "Bid" && attachment.container && attachment.container.courses elsif attachment.container_type == "Bid" && attachment.container && attachment.container.courses
course = attachment.container.courses.first course = attachment.container.courses.first
candown = User.current.member_of_course?(attachment.container.courses.first) || (course.is_public == 1 && attachment.is_public == 1) candown = User.current.member_of_course?(attachment.container.courses.first) || (course.is_public == 1 && attachment.is_public == 1)

56
app/views/projects/dts_dep.html.erb
View File

@ -7,6 +7,8 @@
#out{} #out{}
#in{width:10px; height:20px;background:#15BCCF;color:white;text-align:center;} #in{width:10px; height:20px;background:#15BCCF;color:white;text-align:center;}
#font_color{background:yellow;text-align:center;color:white;} #font_color{background:yellow;text-align:center;color:white;}
td.redBox {border:1px solid #b0b0b0; width:80px; background-color:#EAEAEA; }
td.redBox2 {border:1px solid #b0b0b0; width:120px; }
</style> </style>
<div style="padding-left: 200px;"> <div style="padding-left: 200px;">
<div id='out'> <div id='out'>
@ -42,31 +44,33 @@
</div> </div>
</div> </div>
<div id="show_content_div" style="display: none;padding-top: 10px;"> <div id="show_content_div" style="display: none;padding-top: 0px;">
<p class="fr f14 ">语言：<span style="color: red">Java</span> 总文件数：<span style="color: red">361</span> 代码行数：<span style="color: red">48662</span></p> <p class="fr f14 " style="padding-right: 32px;">语言：<span style="color: red">Java</span> 总文件数：<span style="color: red">361</span> 代码行数：<span style="color: red">48662</span></p>
<div style="padding-left: 35px;padding-top: 30px;">
<% @dts.each do |dt| %>
<% @dts.each do |dt| %> <table width="600" border="0" style="padding-left: 30px; border-spacing:0; border-collapse:collapse; border: 1px solid #b0b0b0;">
<table width="600" border="2" style="padding-top: 10px; padding-left: 30px;"> <tr>
<tr> <td align="center" class="redBox">错误变量</td>
<td align="center" bgcolor="#999999" style="width: 80px"><strong>错误变量</strong></td> <td class="redBox2"> &nbsp;<%= dt.Variable %></td>
<td style="width: 120px"><%= dt.Variable %></td> <td align="center" class="redBox">起始行</td>
<td align="center" bgcolor="#999999" style="width: 80px"><strong>起始行</strong></td> <td class="redBox2"> &nbsp;<%= dt.StartLine %></td>
<td style="width: 120px"><%= dt.StartLine %></td> <td align="center" class="redBox">IP行</td>
<td align="center" bgcolor="#999999" style="width: 80px"><strong>IP行</strong></td> <td class="redBox2"> &nbsp;<%= dt.IPLine %></td>
<td><%= dt.IPLine %></td> </tr>
</tr> <tr>
<tr> <td align="center" class="redBox">缺陷代码</td>
<td align="center" bgcolor="#999999"><strong>缺陷代码</strong></td> <td colspan="5" class="redBox2"> &nbsp;<%= dt.IPLineCode %></td>
<td colspan="5"><%= dt.IPLineCode %></td> </tr>
</tr> <tr>
<tr> <td align="center" class="redBox">错误描述</td>
<td align="center" bgcolor="#999999"><strong>错误描述</strong></td> <td colspan="5" class="redBox2">&nbsp;<%= dt.Description %></td>
<td colspan="5"><%= dt.Description %></td> </tr>
</tr> <tr>
<tr> <td align="center" class="redBox">文件</td>
<td align="center" bgcolor="#999999"><strong>文件</strong></td> <td colspan="5" class="redBox2"> &nbsp;<%= dt.File %></td>
<td colspan="5"><%= dt.File %></td> </tr>
</tr> </table>
</table> <% end %>
<% end %> </div>
</div> </div>

3
app/views/projects/dts_repos.html.erb Normal file
View File

@ -0,0 +1,3 @@
<div class="project_r_h">
<h2 class="project_h2"><%= l(:label_project_dts) %></h2>
</div>

4
app/views/projects/yun_dep.html.erb
View File

@ -42,6 +42,6 @@
</div> </div>
<div id="show_content_div" style="display: none;padding-top: 0px; "> <div id="show_content_div" style="display: none;padding-top: 0px; ">
<p class="pl10 f14 "><span style="color: #7f7f7f;font-size: 14px; ">点击进入：</span> <p class="pl10 f14 "><span style="color: #7f7f7f;font-size: 14px; ">所部署服务的网址：</span>
<span><a href="http://rubyblog.forge.trustie.net/myblog" target="_Blank" style="color: #15BCCF;font-size: 14px;">云化部署平台</a></span></p> <span><a href="http://publify.forge.trustie.net" target="_Blank" style="color: #15BCCF;font-size: 14px;">http://publify.forge.trustie.net</a></span></p>
</div> </div>

3
config/routes.rb
View File

@ -396,8 +396,9 @@ RedmineApp::Application.routes.draw do
get 'invite_members', :action=> 'invite_members' get 'invite_members', :action=> 'invite_members'
get 'invite_members_by_mail', :action=> 'invite_members_by_mail' get 'invite_members_by_mail', :action=> 'invite_members_by_mail'
# get 'dts_repos', :aciton => 'dts_repos'
get 'send_mail_to_member', :action => 'send_mail_to_member' get 'send_mail_to_member', :action => 'send_mail_to_member'
match 'user_watcherlist', :to => 'projects#watcherlist', :via => :get, :as => "watcherlist" #add by huang match 'user_watcherlist', :to => 'projects#watcherlist', :via => :get, :as => "watcherlist"
#end #end
post 'modules' post 'modules'
post 'archive' post 'archive'