Fixed some Ruby 1.9 Rational.to_s issues within the app/views/gantts/show.html.erb file. Fixed some html_safe issues in the views/issue_moves/new.html.erb file and views/issues/_sidebar.html.erb file

Author: escline

app/assets/javascripts/calendar/lang/calendar-hr.js

@@ -51,7 +51,7 @@ Calendar._FD = 0;
 Calendar._MN = new Array
 ("Sijecanj",
  "Veljaca",
- "Ožujak",
+ "Ozujak",
  "Travanj",
  "Svibanj",
  "Lipanj",
@@ -66,7 +66,7 @@ Calendar._MN = new Array
 Calendar._SMN = new Array
 ("Sij",
  "Velj",
- "Ožu",
+ "Ozu",
  "Tra",
  "Svi",
  "Lip",
@@ -100,7 +100,7 @@ Calendar._TT["ABOUT_TIME"] = "\n\n" +
 
 Calendar._TT["PREV_YEAR"] = "Prethodna godina (hold for menu)";
 Calendar._TT["PREV_MONTH"] = "Prethodni mjesec (hold for menu)";
-Calendar._TT["GO_TODAY"] = "Na današnji dan";   
+Calendar._TT["GO_TODAY"] = "Na danasnji dan";   
 Calendar._TT["NEXT_MONTH"] = "Naredni mjesec (hold for menu)";
 Calendar._TT["NEXT_YEAR"] = "Naredna godina (hold for menu)";
 Calendar._TT["SEL_DATE"] = "Odaberite datum";
@@ -109,7 +109,7 @@ Calendar._TT["PART_TODAY"] = " (Danas)";
 
 // the following is to inform that "%s" is to be the first day of week
 // %s will be replaced with the day name.
-Calendar._TT["DAY_FIRST"] = "Prikaži %s prvo";
+Calendar._TT["DAY_FIRST"] = "Prikazi %s prvo";
 
 // This may be locale-dependent.  It specifies the week-end days, as an array
 // of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1

app/helpers/issues_helper.rb

@@ -148,7 +148,7 @@ def query_links(title, queries)
     content_tag('h3', h(title)) +
       queries.collect {|query|
           link_to(h(query.name), url_params.merge(:query_id => query))
-        }.join('<br />')
+        }.join('<br />').html_safe
   end
 
   def render_sidebar_queries

app/views/gantts/show.html.erb

@@ -39,21 +39,21 @@ headers_height = header_heigth
 show_weeks = false
 show_days = false
 
-if @gantt.zoom >1
+if @gantt.zoom > 1
     show_weeks = true
-    headers_height = 2*header_heigth
+    headers_height = 2 * header_heigth
     if @gantt.zoom > 2
         show_days = true
-        headers_height = 3*header_heigth
+        headers_height = 3 * header_heigth
     end
 end
 
 # Width of the entire chart
-g_width = (@gantt.date_to - @gantt.date_from + 1)*zoom
+g_width = (@gantt.date_to - @gantt.date_from + 1) * zoom
 
 @gantt.render(:top => headers_height + 8, :zoom => zoom, :g_width => g_width, :subject_width => subject_width)
 
-g_height = [(20 * (@gantt.number_of_rows + 6))+150, 206].max
+g_height = [(20 * (@gantt.number_of_rows + 6)) + 150, 206].max
 t_height = g_height + headers_height
 
 
@@ -80,7 +80,7 @@ t_height = g_height + headers_height
 <td>
 
 <div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
-<div style="width:<%= g_width-1 %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr">&nbsp;</div>
+<div style="width:<%= g_width - 1 %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr">&nbsp;</div>
 <%
 #
 # Months headers
@@ -89,7 +89,7 @@ month_f = @gantt.date_from
 left = 0
 height = (show_weeks ? header_heigth : header_heigth + g_height)
 @gantt.months.times do
-  width = ((month_f >> 1) - month_f) * zoom - 1
+  width = ((month_f >> 1) - month_f).to_i * zoom - 1
   %>
   <div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
   <%= link_to h("#{month_f.year}-#{month_f.month}"), @gantt.params.merge(:year => month_f.year, :month => month_f.month), :title => "#{month_name(month_f.month)} #{month_f.year}"%>
@@ -105,29 +105,29 @@ end %>
 #
 if show_weeks
   left = 0
-  height = (show_days ? header_heigth-1 : header_heigth-1 + g_height)
+  height = (show_days ? header_heigth - 1 : header_heigth - 1 + g_height)
   if @gantt.date_from.cwday == 1
       # @date_from is monday
         week_f = @gantt.date_from
   else
       # find next monday after @date_from
     week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)
-    width = (7 - @gantt.date_from.cwday + 1) * zoom-1
+    width = (7 - @gantt.date_from.cwday + 1) * zoom - 1
     %>
     <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">&nbsp;</div>
     <%
-    left = left + width+1
+    left = left + width + 1
   end %>
   <%
   while week_f <= @gantt.date_to
-    width = (week_f + 6 <= @gantt.date_to) ? 7 * zoom -1 : (@gantt.date_to - week_f + 1) * zoom-1
+    width = (week_f + 6 <= @gantt.date_to) ? 7 * zoom - 1 : (@gantt.date_to - week_f + 1) * zoom - 1
     %>
     <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
     <small><%= week_f.cweek if width >= 16 %></small>
     </div>
     <%
-    left = left + width+1
-    week_f = week_f+7
+    left = left + width + 1
+    week_f = week_f + 7
   end
 end %>
 
@@ -146,7 +146,7 @@ if show_days
   <%= day_name(wday).first %>
   </div>
   <%
-  left = left + width+1
+  left = left + width + 1
   wday = wday + 1
   wday = 1 if wday > 7
   end
@@ -159,7 +159,7 @@ end %>
 # Today red line (excluded from cache)
 #
 if Date.today >= @gantt.date_from and Date.today <= @gantt.date_to %>
-    <div style="position: absolute;height:<%= g_height %>px;top:<%= headers_height + 1 %>px;left:<%= ((Date.today-@gantt.date_from+1)*zoom).floor()-1 %>px;width:10px;border-left: 1px dashed red;">&nbsp;</div>
+    <div style="position: absolute;height:<%= g_height %>px;top:<%= headers_height + 1 %>px;left:<%= ((Date.today-@gantt.date_from+1) * zoom).floor() - 1 %>px;width:10px;border-left: 1px dashed red;">&nbsp;</div>
 <% end %>
 
 </div>

app/views/issue_moves/new.html.erb

@@ -7,7 +7,7 @@
 </ul>
 
 <%= form_tag({:action => 'create'}, :id => 'move_form') do %>
-<%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
+<%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join.html_safe %>
 
 <div class="box tabular">
 <fieldset class="attributes">

app/views/issues/_sidebar.html.erb

@@ -13,5 +13,5 @@
 <% end %>
 <%= call_hook(:view_issues_sidebar_planning_bottom) %>
 
-<%= render_sidebar_queries %>
+<%= render_sidebar_queries.html_safe %>
 <%= call_hook(:view_issues_sidebar_queries_bottom) %>

config/routes.rb

@@ -136,7 +136,7 @@
   map.resources :projects, :shallow => true, :member => {
     :copy => [:get, :post],
     :settings => :get,
-    :modules => :post,
+    :modules => :put,
     :archive => :post,
     :unarchive => :post
   } do |project|