qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
z9hang 2014-09-09 13:46:02 +08:00
parent c9f6259587 c4a69424ef
commit e9ac470eec
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/project_status.rb
View File

@ -12,7 +12,7 @@ class ProjectStatus < ActiveRecord::Base
# 但是 如果超级用户删除其他用户的话会造成读取错误 这里是遗漏点
# 删除用户时 此表创建人员未作相应删除动作
def update_watchers_count(num)
if self.watchers_count >= 0
if self.watchers_count||0 >= 0
self.update_attribute(:watchers_count, self.watchers_count.to_i + num)
end
end

2
app/views/contests/_new_softapplication.html.erb
View File

@ -166,7 +166,7 @@
<%= render :partial => 'attachments/form' %>
</p>
<p style="font-size: 11px">
<p style="font-size: 11px;line-height:normal;">
1、<%= l(:label_upload_softapplication_packets_mustpacketed) %> <br/>
<br>
2、<%= l(:label_upload_softapplication_photo_condition) %>

12
app/views/projects/_project.html.erb
View File

@ -82,7 +82,7 @@
<% end %>
<%= content_tag('span', link_to(files_count, file_project_path(@project)), :class => "info") %><%= content_tag('span', l(:label_x_data,:count => files_count)) %>
</p>
</div>
<% end %>
@ -114,19 +114,19 @@
<% if(@project.project_type==1)%>
&nbsp;&nbsp;&nbsp;<%= l(:label_course_college) %>：
<%if @admin&&@admin.first&&@admin.first.user&&@admin.first.user.user_extensions%>
<%= @admin.first.user.user_extensions.occupation %>
<%= @admin.first.user.user_extensions.occupation %>
<% end %>
<% end %>
</div>
<div class="licences">
<%= content_tag('span', "#{l(:label_create_time)}: ") %><%= content_tag('span', format_time(@project.created_on)) %>
</div>
<!-- added by bai -->
<div class="grade">
<% if @project.project_type !=1 %>
<%= l(:label_project_grade)%>:
<%= l(:label_project_grade)%>:
<span >
<%= link_to(format("%.2f" , red_project_scores(@project) ).to_i,
{:controller => 'projects',
@ -138,7 +138,7 @@
<!-- end -->
<!-- added by liuping -->
<!-- added by liuping -->
</span>
</div>

2
app/views/softapplications/_form.html.erb
View File

@ -112,7 +112,7 @@
<p id="put-bid-form-partial">
<%= render :partial => 'attachments/form' %>
</p>
<p style="font-size: 10px">1、<%=l(:label_upload_softapplication_packets_mustpacketed)%><br>2、<%=l(:label_upload_softapplication_photo_condition)%></p>
<p style="font-size: 10px;">1、<%=l(:label_upload_softapplication_packets_mustpacketed)%><br>2、<%=l(:label_upload_softapplication_photo_condition)%></p>
<!-- p style="font-size: 10px; color: red"><%#=l(:label_updated_caution)%></p-->
</fieldset>

4
db/schema.rb
View File

@ -441,10 +441,10 @@ ActiveRecord::Schema.define(:version => 20140826072838) do
t.datetime "updated_at", :null => false
t.string "page_type"
t.integer "sort_type"
t.integer "image_width", :default => 107
t.integer "image_height", :default => 63
t.integer "show_course", :default => 1
t.integer "show_contest", :default => 1
t.integer "image_width", :default => 107
t.integer "image_height", :default => 63
end
create_table "forums", :force => true do |t|