From 90925edce29199019eb1176bac9fc3297230d785 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 12 Jan 2015 17:56:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E9=A1=B5=E9=9D=A2css=E5=BC=95=E8=B5=B7?=
 =?UTF-8?q?=E7=9A=84css=E9=94=99=E4=B9=B1=E3=80=8B=E5=92=8C=E3=80=8A?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=A6=96=E9=A1=B5=E5=8A=A8=E6=80=81=E5=A4=AA?=
 =?UTF-8?q?=E5=B0=91=E3=80=8Bbug=20Signed-off-by:=20alan=20<547533434@qq.c?=
 =?UTF-8?q?om>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_feedback.html.erb       |  6 +++---
 .../lib/acts_as_activity_provider.rb            | 17 ++++++++++++-----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb
index 859ed0361..62b3a01e3 100644
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@@ -62,7 +62,7 @@ function f_submit()
 <style type="text/css">
 /*浮窗*/ 
 body{ height:3000px; font-family:'微软雅黑';} 
-div,ul,li,body,h3,p{margin:0; padding:0;} 
+
 a{ text-decoration:none;}
 #roll{ background:url(/images/f_opnion.jpg) 0 0 no-repeat;width:157px; height:332px; position:absolute;}
 .opnionBox{ width: 130px; height:146px; margin:76px auto 20px; } 
@@ -101,10 +101,10 @@ a:hover.opnionButton{ text-decoration:underline;}
 	<% get_memo %>
 		<%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
 	<div class="actions" style="max-width:680px">
-		<p>
+		<p style="margin:0; padding:0;">
           <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%>
         </p>
-        <p>
+        <p style="margin:0; padding:0;">
           <%= f.hidden_field :content, :required => true ,:value=>'该贴来自用户反馈！'%>
         </p>
 		  <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %>
diff --git a/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb b/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
index c809ac9b4..17f834c84 100644
--- a/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
+++ b/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
@@ -91,12 +91,19 @@ module Redmine
               ActiveSupport::Deprecation.warn "acts_as_activity_provider with implicit :permission option is deprecated. Add a visible scope to the #{self.name} model or use explicit :permission option."
               scope = scope.scoped(:conditions => Project.allowed_to_condition(user, "view_#{self.name.underscore.pluralize}".to_sym, options))
             end
-            to = scope.select(:created_on).order("created_on desc").first.created_on
-            if options[:course]
-              from = (to - days) > created_time ? (to - days) : created_time.to_date
-            else
-              from =  to - days -1.years
+            unless scope.all(provider_options[:find_options].dup).first.nil?
+              if provider_options[:timestamp].include? "updated_on"
+                to = scope.scoped(:order => "#{provider_options[:timestamp]} desc").all(provider_options[:find_options].dup).first.updated_on
+              else
+                to = scope.scoped(:order => "#{provider_options[:timestamp]} desc").all(provider_options[:find_options].dup).first.created_on
+              end
+              if options[:course]
+                from = (to - days.days) > created_time ? (to - days.days) : created_time.to_date
+              else
+                from =  to - days.days - 1.years
+              end
             end
+
             if from && to
               scope = scope.scoped(:conditions => ["#{provider_options[:timestamp]} BETWEEN ? AND ?", from, to])
             end