From 547a268af89466570fa42238defe0bb591e4f2b8 Mon Sep 17 00:00:00 2001
From: fanqiang <316257774@qq.com>
Date: Mon, 5 May 2014 15:33:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E=E7=9A=84=E4=B8=80=E4=BA=9B=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/relative_memo.rb                         | 2 +-
 app/views/layouts/base_opensource_p.html.erb        | 6 +++---
 app/views/open_source_projects/_os_project.html.erb | 2 +-
 app/views/relative_memos/show.html.erb              | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/models/relative_memo.rb b/app/models/relative_memo.rb
index 6a4706633..24504241e 100644
--- a/app/models/relative_memo.rb
+++ b/app/models/relative_memo.rb
@@ -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
diff --git a/app/views/layouts/base_opensource_p.html.erb b/app/views/layouts/base_opensource_p.html.erb
index da743f3a9..e184bdc21 100644
--- a/app/views/layouts/base_opensource_p.html.erb
+++ b/app/views/layouts/base_opensource_p.html.erb
@@ -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">
diff --git a/app/views/open_source_projects/_os_project.html.erb b/app/views/open_source_projects/_os_project.html.erb
index cae5b963b..43161f993 100644
--- a/app/views/open_source_projects/_os_project.html.erb
+++ b/app/views/open_source_projects/_os_project.html.erb
@@ -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>
diff --git a/app/views/relative_memos/show.html.erb b/app/views/relative_memos/show.html.erb
index 2d85a19aa..be870b7eb 100644
--- a/app/views/relative_memos/show.html.erb
+++ b/app/views/relative_memos/show.html.erb
@@ -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>