Merge pull request #623 from daneshd/issue428

FIX #428 HTML is escaped from I18n.t - used raw function.
MarkUsProject · Jan 30, 2012 · c5f3e56 · c5f3e56
2 parents b17cd55 + 6412a51
commit c5f3e56
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/app/views/assignments/student_interface.html.erb b/app/views/assignments/student_interface.html.erb
@@ -95,7 +95,7 @@
 
           <% @pending_grouping.each do |grouping|%>
           <div class="sub_block">
-            <p><%= I18n.t("student.invited_by", :inviter_last_name => h(grouping.inviter.last_name), :inviter_first_name => h(grouping.inviter.first_name)) %>
+            <p><%= raw(I18n.t("student.invited_by", :inviter_last_name => h(grouping.inviter.last_name), :inviter_first_name => h(grouping.inviter.first_name))) %>
             </p>
             <% grouping.student_memberships.each do |member|%>
               <ul>

diff --git a/app/views/groups/student_manage/_member.html.erb b/app/views/groups/student_manage/_member.html.erb
@@ -30,11 +30,11 @@
 <% elsif member.membership_status == StudentMembership::STATUSES[:rejected] %>
     <% if grouping.inviter.id == @student.id %>
       <li>
-      	<%= I18n.t("student.invitation_rejected", :user_last_name => h(member.user.last_name), :user_first_name => h(member.user.first_name)) %>
-	   	<%= link_to_remote "<b>x</b>", :method => :delete,
-	      :url => {:action => 'delete_rejected', :id => @assignment.id,
-	      :membership => member.id}%>
-	  </li>
+        <%= raw(I18n.t("student.invitation_rejected", :user_last_name => h(member.user.last_name), :user_first_name => h(member.user.first_name))) %>
+        <%= link_to_remote "<b>x</b>", :method => :delete,
+        :url => {:action => 'delete_rejected', :id => @assignment.id,
+        :membership => member.id}%>
+      </li>
     <% end %>
 <% end %>
 
diff --git a/app/views/results/common/_submission_selector.html.erb b/app/views/results/common/_submission_selector.html.erb
@@ -11,8 +11,8 @@
   <% end %>
 </span>
   <span class="middle">
-    <%= link_to I18n.t("marker.notes",
-		:notes => @grouping.notes.size),
+    <%= link_to raw(I18n.t("marker.notes",
+		:notes => @grouping.notes.size)),
 	        :url => {:controller => 'note',
 			 :action => 'notes_dialog',
 			 :id => @grouping.assignment_id,

diff --git a/app/views/submissions/repo_browser.html.erb b/app/views/submissions/repo_browser.html.erb
@@ -42,7 +42,7 @@
     </fieldset>
   </div>
 <div class="global_actions">
-  <h2><%= I18n.t("browse_submissions.viewing_revision", :revision_number => @revision_number) %>
+  <h2><%= raw(I18n.t("browse_submissions.viewing_revision", :revision_number => @revision_number)) %>
       (<span id="current_revision_timestamp_display">
          <%= I18n.l(@revision_timestamp, :format => :long_date) %>
       </span>)