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? %> +
<%=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) %> | diff --git a/public/images/mes.png b/public/images/mes.png new file mode 100644 index 000000000..9e7837020 Binary files /dev/null and b/public/images/mes.png differ