check that block is defined before rendering it (my/page_layout)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@244 e93f8b46-1217-0410-a6f0-8f06a7374b81

check that block is defined before rendering it (my/page_layout)
git-svn-id: http://redmine.rubyforge.org/svn/trunk@244 e93f8b46-1217-0410-a6f0-8f06a7374b81
92725e58 · Jean-Philippe Lang · 73510949 · 92725e58
Commit 92725e58 authored Feb 05, 2007 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

page_layout.rhtml app/views/my/page_layout.rhtml +6 -3

No files found.
--- a/app/views/my/page_layout.rhtml
+++ b/app/views/my/page_layout.rhtml
@@ -55,19 +55,22 @@ function removeBlock(block) {
 <h2><%=l(:label_my_page)%></h2>

 <div id="list-top" class="block-receiver">
-	<% @blocks['top'].each do |b| %>
+	<% @blocks['top'].each do |b| 
+	   next unless MyController::BLOCKS.keys.include? b %>
 	<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
 	<% end if @blocks['top'] %>
 </div>

 <div id="list-left" class="splitcontentleft block-receiver">
-	<% @blocks['left'].each do |b| %>
+	<% @blocks['left'].each do |b| 
+	   next unless MyController::BLOCKS.keys.include? b %>
 	<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
 	<% end if @blocks['left'] %>
 </div>

 <div id="list-right" class="splitcontentright block-receiver">
-	<% @blocks['right'].each do |b| %>
+	<% @blocks['right'].each do |b| 
+	   next unless MyController::BLOCKS.keys.include? b %>
 	<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
 	<% end if @blocks['right'] %>
 </div>