Don't render delete button unless channel metadata contains trueish d…

…estroyable flage.
kandanapp · Mar 15, 2013 · b6b983a · b6b983a
1 parent 3de5e3a
commit b6b983a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/app/assets/javascripts/backbone/views/channel_tabs.js.coffee b/app/assets/javascripts/backbone/views/channel_tabs.js.coffee
@@ -33,7 +33,6 @@ class Kandan.Views.ChannelTabs extends Backbone.View
         error: (model, response)->
           _.each(JSON.parse(response.responseText), alert);
       })
-      console.log "create channel: #{channelName}"
     return false
 
   deleteChannel: (event)->

diff --git a/app/assets/templates/channel_tabs.jst.eco b/app/assets/templates/channel_tabs.jst.eco
@@ -5,7 +5,7 @@
     <span class="tab_left"></span>
     <span class="tab_content">	
       <cite><%= channel.get('name') %></cite>
-      <% unless channel.get('id') == 1: %>
+      <% if channel.get('destroyable'): %>
         <cite class="close_channel" title="close channel">x</cite>
       <% end %>
     </span>

diff --git a/app/controllers/channels_controller.rb b/app/controllers/channels_controller.rb
@@ -17,7 +17,7 @@ def index
         })
       end
 
-      nested_channel_data.push channel.attributes.merge({:activities => activities.reverse, :more_activities => more_activities})
+      nested_channel_data.push channel.attributes.merge({:activities => activities.reverse, :more_activities => more_activities, destroyable: can?(:destroy, channel)})
     end
 
     respond_to do |format|