From 14ebb13bc1339824ca65c7ccdcba7d3fd78b1c33 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 14 Feb 2015 17:25:51 +0100
Subject: [PATCH] meeting fixes

---
 app/controllers/meetings_controller.rb  | 4 ++--
 app/models/ability.rb                   | 1 +
 app/models/meeting.rb                   | 2 +-
 app/views/calentries/_calentry.html.erb | 2 ++
 app/views/meetings/_meeting.html.erb    | 2 +-
 app/views/themen/_small.html.erb        | 6 ++++--
 app/views/themen/show.html.erb          | 2 +-
 7 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/controllers/meetings_controller.rb b/app/controllers/meetings_controller.rb
index 8801689..c666945 100644
--- a/app/controllers/meetings_controller.rb
+++ b/app/controllers/meetings_controller.rb
@@ -6,9 +6,9 @@ class MeetingsController < ApplicationController
     unless parent.nil?
       #authorize! :show, parent
       if params[:filter]=="upcomming"
-        @meetings=parent.meetings.includes(:calentry).where("calentries.start>?",1.hour.ago)
+        @meetings=parent.meetings.upcomming
       else
-      @meetings=parent.meetings
+        @meetings=parent.meetings
       end
       @parent=parent
     end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index b681145..e00018d 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -92,6 +92,7 @@ class Ability
     if loggedin
     end
     if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
+
       can :showversions, Neuigkeit
       can :showintern, Neuigkeit
       can :showintern, Rubrik
diff --git a/app/models/meeting.rb b/app/models/meeting.rb
index cd174bc..da1a8ea 100644
--- a/app/models/meeting.rb
+++ b/app/models/meeting.rb
@@ -10,7 +10,7 @@ class Meeting < ActiveRecord::Base
   has_one :calentry, as: :object
   has_one :calendar, :through=>:meetingtyp
   has_one :rubrik, :through=>:meetingtyp
-
+  scope :upcomming, includes(:calentry).where("calentries.start>?",1.hour.ago)
   accepts_nested_attributes_for :calentry
 #  validate :agenda, :presence=>true
 #  validate :protocol, :presence=>true
diff --git a/app/views/calentries/_calentry.html.erb b/app/views/calentries/_calentry.html.erb
index b591e28..d96f6b6 100644
--- a/app/views/calentries/_calentry.html.erb
+++ b/app/views/calentries/_calentry.html.erb
@@ -8,6 +8,8 @@
      format =:default
      end %>
   <%= calentry.text %>
+<% if !(defined? manage) || manage %>
   <%= link_to "edit", edit_calentry_path(calentry),:remote=>true if can? :edit, calentry %>
   <%= link_to 'Delete', calentry, method: :delete, data: { confirm: 'Are you sure?' } , remote: true if can? :delete, calentry %>
+<% end %>
 </div>
diff --git a/app/views/meetings/_meeting.html.erb b/app/views/meetings/_meeting.html.erb
index 9298e28..08c3362 100644
--- a/app/views/meetings/_meeting.html.erb
+++ b/app/views/meetings/_meeting.html.erb
@@ -5,7 +5,7 @@
 <%= link_to "ankündigen", announce_meeting_path(meeting), remote: true if meeting.neuigkeit.nil? %>
 <%= link_to "edit", edit_meeting_path(meeting), remote: true %>
 <%= link_to 'Delete', meeting, method: :delete, data: { confirm: 'Are you sure?' } , remote: true if can? :delete, meeting %>
-<%= render meeting.calentry unless meeting.calentry.nil? %>
+<%= render meeting.calentry, locals: {manage: 0} unless meeting.calentry.nil? %>
 <%= link_to  "Agenda" , create_agenda_meeting_path(meeting), :remote=>true if meeting.agenda.nil?  %>
 <%= link_to  "Protokoll" , create_protocol_meeting_path(meeting),:remote=>true if meeting.protocol.nil? %>
 <%= render meeting.agenda unless meeting.agenda.nil? %>
diff --git a/app/views/themen/_small.html.erb b/app/views/themen/_small.html.erb
index ac371e3..82a4409 100644
--- a/app/views/themen/_small.html.erb
+++ b/app/views/themen/_small.html.erb
@@ -27,8 +27,10 @@
 <b>Treffen/Sitzungen</b>
 <%= link_to "Neues Meeting", new_meeting_path(:parent_id=>small.id, :parent_type=>"Thema"), :remote=>true %>
 <div id="<%= Meeting.new_divid_for(small) %>"></div>
-<%= link_to "All", meetings_path(:parent_id=>small.id, :parent_type=>"Thema"), :remote=>true %>
-<%= link_to "upcomming", meetings_path(:parent_id=>small.id, :parent_type=>"Thema",:filter=>"upcomming"), :remote=>true %>
+<ul class="nav nav-tabs">
+<li><%= link_to "All", meetings_path(:parent_id=>small.id, :parent_type=>"Thema"), :remote=>true if small.meetings.accessible_by(current_ability).count >0 %></li>
+<li><%= link_to "upcomming", meetings_path(:parent_id=>small.id, :parent_type=>"Thema",:filter=>"upcomming"), :remote=>true  if small.meetings.accessible_by(current_ability).upcomming.count >0 %></li>
+</ul>
 <%= render :partial=>"meetings/meeting_list", object: small.meetings, locals: {parent: small} %>
 <% end %>
 
diff --git a/app/views/themen/show.html.erb b/app/views/themen/show.html.erb
index af06bba..692df6f 100644
--- a/app/views/themen/show.html.erb
+++ b/app/views/themen/show.html.erb
@@ -10,7 +10,7 @@
   }
 %> 
 
-<%=
+<%
    unless @thema.titlepics.first.nil?
      picture_url=URI(root_url)
      picture_url.path=@thema.titlepics.first.datei.url(:locale=>nil, :theme=>nil)