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

修改合并之后的一些小问题

This commit is contained in:
fanqiang 2014-05-05 15:33:24 +08:00
parent dc4e928741
commit 547a268af8
4 changed files with 6 additions and 6 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 :subject, maximum: 50
#validates_length_of :content, maximum: 3072 #validates_length_of :content, maximum: 3072
validate :cannot_reply_to_locked_topic, :on => :create 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_tree :counter_cache => :replies_count, :order => "#{RelativeMemo.table_name}.created_at ASC"
acts_as_attachable acts_as_attachable

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

@ -48,7 +48,7 @@
<div id="sidebar"> <div id="sidebar">
<div class="spaceleft"> <div class="spaceleft">
<div class="inf_user_image"> <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> <table>
<tr> <tr>
<td><%= image_tag('../images/avatars/Project/0', :class => 'avatar2') %></td> <td><%= image_tag('../images/avatars/Project/0', :class => 'avatar2') %></td>
@ -69,9 +69,9 @@
<div class="user_fans"> <div class="user_fans">
<table width="240" border="0"> <table width="240" border="0">
<tr align="center" width="80px"> <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"><%= @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>
<tr class="font_aram"> <tr class="font_aram">

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

@ -63,6 +63,6 @@
<div class="tags"> <div class="tags">
<div id="tags"> <div id="tags">
<%= image_tag( "/images/sidebar/tags.png") %> <%= 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>
</div> </div>

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

@ -67,7 +67,7 @@
<div class="tags"> <div class="tags">
<div id="tags"> <div id="tags">
<%= image_tag( "/images/sidebar/tags.png") %> <%= 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> </div>
</div> </div>