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:
Wen 2014-05-06 15:16:13 +08:00
parent d94e15cd94 31dff76b3a
commit e8247b6edd
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/relative_memo.rb
View File

@ -17,7 +17,7 @@ class RelativeMemo < ActiveRecord::Base
# validates_length_of :subject, maximum: 50
#validates_length_of :content, maximum: 3072
validate :cannot_reply_to_locked_topic, :on => :create
validates_uniqueness_of :osp_id, :scope => [:subject, :context]
validates_uniqueness_of :osp_id, :scope => [:subject, :content]
acts_as_tree :counter_cache => :replies_count, :order => "#{RelativeMemo.table_name}.created_at ASC"
acts_as_attachable

6
app/views/layouts/base_opensource_p.html.erb
View File

@ -48,7 +48,7 @@
<div id="sidebar">
<div class="spaceleft">
<div class="inf_user_image">
<% @open_source_project = OpenSourceProject.find(params[:id])%>
<% @open_source_project = OpenSourceProject.find(params[:open_source_project_id] || params[:id])%>
<table>
<tr>
<td><%= image_tag('../images/avatars/Project/0', :class => 'avatar2') %></td>
@ -69,9 +69,9 @@
<div class="user_fans">
<table width="240" border="0">
<tr align="center" width="80px">
<td class="font_index"><%= 0 %></td>
<td class="font_index"><%= @open_source_project.users_count %></td>
<td class="font_index"><%= 0 %></td>
<td class="font_index"><%= @open_source_project.topics.count %></td>
<td class="font_index"><%= @open_source_project.commit_count %></td>
</tr>
<tr class="font_aram">

2
app/views/open_source_projects/_os_project.html.erb
View File

@ -63,6 +63,6 @@
<div class="tags">
<div id="tags">
<%= image_tag( "/images/sidebar/tags.png") %>
<%= render :partial => 'tags/tag_name', :locals => {:obj => project,:object_flag => "7",:non_list_all => true }%>
<%= render :partial => 'tags/tag_name', :locals => {:obj => project,:object_flag => "8",:non_list_all => true }%>
</div>
</div>

2
app/views/relative_memos/show.html.erb
View File

@ -67,7 +67,7 @@
<div class="tags">
<div id="tags">
<%= image_tag( "/images/sidebar/tags.png") %>
<%= render :partial => 'tags/tag_name', :locals => {:obj => @memo,:object_flag => "8",:non_list_all => true }%>
<%= render :partial => 'tags/tag_name', :locals => {:obj => @memo,:object_flag => "9",:non_list_all => true }%>
</div>
</div>
</div>

2
app/views/welcome/contest.html.erb
View File

@ -152,7 +152,7 @@
<div style="float: left; margin-left: 12px; margin-top: 10px; margin-bottom: -4px; width: 380px;">
<!-- <%= link_to(contest.name, contest.event_url, :class => "d-g-blue d-p-project-name", :title => "#{contest.name}", :target => "_blank") %> -->
<%= link_to(contest.name, show_contest_contest_path(contest.id), :class => "d-g-blue d-p-project-name", :title => "#{contest.name}", :target => "_blank") %>
<span class="font_lighter">(<span style="font-size: 17px"><%= link_to("含#{contest.contesting_softapplications.count}个app", show_softapplication_contest_path(contest), :target => "_blank") %></span>)</span>
<span class="font_lighter">(<span style="font-size: 13px"><%= link_to("含#{contest.contesting_softapplications.count}个app", show_softapplication_contest_path(contest), :target => "_blank") %></span>)</span>
</div>
<div class='text_nowrap' style="float: left;margin:5px; margin-left: 12px; margin-bottom: 2px; width: 380px;">