|
|
@@ -5,12 +5,12 @@ |
|
|
|
# modify it under the terms of the GNU General Public License |
|
|
|
# as published by the Free Software Foundation; either version 2 |
|
|
|
# of the License, or (at your option) any later version. |
|
|
|
# |
|
|
|
# |
|
|
|
# This program is distributed in the hope that it will be useful, |
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
|
|
# GNU General Public License for more details. |
|
|
|
# |
|
|
|
# |
|
|
|
# You should have received a copy of the GNU General Public License |
|
|
|
# along with this program; if not, write to the Free Software |
|
|
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
|
@@ -33,11 +33,11 @@ class CalendarsController < ApplicationController |
|
|
|
@year = params[:year].to_i |
|
|
|
if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13 |
|
|
|
@month = params[:month].to_i |
|
|
|
end |
|
|
|
end |
|
|
|
end |
|
|
|
@year ||= Date.today.year |
|
|
|
@month ||= Date.today.month |
|
|
|
|
|
|
|
|
|
|
|
@calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month) |
|
|
|
retrieve_query |
|
|
|
@query.group_by = nil |
|
|
@@ -47,10 +47,10 @@ class CalendarsController < ApplicationController |
|
|
|
:conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt] |
|
|
|
) |
|
|
|
events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt]) |
|
|
|
|
|
|
|
|
|
|
|
@calendar.events = events |
|
|
|
end |
|
|
|
|
|
|
|
|
|
|
|
render :action => 'show', :layout => false if request.xhr? |
|
|
|
end |
|
|
|
end |