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

Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

This commit is contained in:
kg 2014-04-10 10:03:49 +08:00
parent 9ab5db8ee3 ac4e74af91
commit b1705ddf7d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ReadMe.txt
View File

@ -1,4 +1,4 @@
app\models\setting.rb :165 app/models/setting.rb :165
# fixed domain url in development. tantantan's bug # fixed domain url in development. tantantan's bug
if Rails.env.development? if Rails.env.development?
methods.map do |m| methods.map do |m|
@ -9,6 +9,10 @@ app\models\setting.rb :165
为了开发方便，使之功能在development模式下失效。 为了开发方便，使之功能在development模式下失效。
# => nyan # => nyan
================================================================================ ================================================================================
app/controller/projects_controller.rb ===> projects#fake
fake filter: 修改了传到页面中的Count后缀的数量
改为正确的数量，删掉fake过滤器即可
================================================================================
#导航栏匹配域名显示和改变 #导航栏匹配域名显示和改变
app\helper\application_helper.rb app\helper\application_helper.rb
# rewrite navigation # rewrite navigation

3
app/views/layouts/base_homework.html.erb
View File

@ -82,6 +82,9 @@
<tr> <tr>
<td><%= l(:label_limit_time) %>: <%= @bid.deadline %></td> <td><%= l(:label_limit_time) %>: <%= @bid.deadline %></td>
</tr> </tr>
<tr>
<td>作业类型: <%=@bid.homework_type==Bid::HomeworkFile ? "提交文件" : "提交项目"%></td>
</tr>
<% unless @bid.parent_id.nil?%> <% unless @bid.parent_id.nil?%>
<tr> <tr>
<td> <td>