From 72b37a915a51efdba136bb16f2f7b53d42b4a32c Mon Sep 17 00:00:00 2001 From: baiyu <316257774@qq.com> Date: Sun, 25 Aug 2013 20:19:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=95=99=E8=A8=80=E6=8F=90?= =?UTF-8?q?=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 3 +++ app/controllers/words_controller.rb | 3 ++- app/models/user.rb | 7 ++++++- app/views/layouts/_base_header.html.erb | 7 +++++++ app/views/layouts/base_projects.html.erb | 6 +++++- public/images/mes.png | Bin 0 -> 4244 bytes 6 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 public/images/mes.png diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 5487ae38c..751d497ca 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -121,6 +121,9 @@ class UsersController < ApplicationController # modified by fq def user_newfeedback @jours = @user.journals_for_messages.reverse + @jours.each do |jour| + jour.update_attribute(:status, false) + end @limit = 10 @feedback_count = @jours.count @feedback_pages = Paginator.new @feedback_count, @limit, params['page'] diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index 2fe1f61dc..ed14686b0 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -13,6 +13,7 @@ class WordsController < ApplicationController refer_user_id = params[:new_form][:reference_user_id].to_i @user.add_jour(User.current, message, refer_user_id) + @user.count_new_jour # if a_message.size > 5 # @message = a_message[-5, 5] # else @@ -27,7 +28,7 @@ class WordsController < ApplicationController @feedback_pages = Paginator.new @feedback_count, @limit, params['page'] @offset ||= @feedback_pages.offset @jour = @jours[@offset, @limit] - + respond_to do |format| # format.html { redirect_to_referer_or {render :text => 'Watcher added.', :layout => true}} format.js diff --git a/app/models/user.rb b/app/models/user.rb index ae672b53a..21e1664e1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -81,6 +81,7 @@ class User < Principal has_many :jours, :class_name => 'JournalsForMessage', :dependent => :destroy has_many :bids, :foreign_key => 'author_id', :dependent => :destroy has_many :journals_for_messages, :as => :jour, :dependent => :destroy + has_many :new_jours, :as => :jour, :class_name => 'JournalsForMessage', :conditions => "status=1" has_many :journal_replies has_many :activities ##### @@ -141,7 +142,11 @@ class User < Principal ###添加留言 fq def add_jour(user, notes, reference_user_id = 0) - self.journals_for_messages << JournalsForMessage.new(:user_id => user.id, :notes => notes, :reply_id => reference_user_id) + self.journals_for_messages << JournalsForMessage.new(:user_id => user.id, :notes => notes, :reply_id => reference_user_id, :status => true) + end + + def count_new_jour + count = self.new_jours.count end def set_mail_notification diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index 892be7e42..f67066c30 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -7,6 +7,13 @@ <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %> + <%= content_tag('div', "#{link_to(image_tag('/images/mes.png'), feedback_path(User.current))}".html_safe, :id => 'loggedas') if User.current.logged? %> +
+ <%= User.current.count_new_jour%> +
+ + + <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 515e43cdc..c0cd755a8 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -50,10 +50,14 @@ + <% files_count = @project.attachments.count %> + <% @project.versions.each do |version| %> + <% files_count += version.attachments.count %> + <% end %> - + diff --git a/public/images/mes.png b/public/images/mes.png new file mode 100644 index 0000000000000000000000000000000000000000..9e78370207f53b62ea7bfb113c9f2b531dc2253a GIT binary patch literal 4244 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
<%=link_to "#{@project.members.count}", project_member_path(@project) %> <%=link_to "#{@project.issues.count}", project_issues_path(@project) %><%=link_to "#{@project.attachments.count}", project_files_path(@project) %><%=link_to files_count, project_files_path(@project) %>
<%= l(:label_member) %> <%= l(:label_project_issues) %>