diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 34725b2..ccf195d 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -33,7 +33,7 @@ class HomeController < ApplicationController def search unless params['query'].nil? || params['query'].empty? - @results = Sunspot.search Neuigkeit,Rubrik, Fetprofile, Thema, Themengruppe, Lva, Studium, Modul, Modulgruppe do + @results = Sunspot.search Neuigkeit,Rubrik, Fetprofile, Thema, Themengruppe, Lva, Studium, Modul, Modulgruppe, Gremium do fulltext params['query'] end @neuigkeiten=[]; @@ -42,6 +42,11 @@ class HomeController < ApplicationController else # @neuigkeiten =Neuigkeit.search(params['query']).public end + @res=[] + @results.results.each do |r| + @res << r if can?(:show,r) + end + # @fetprofiles = Fetprofile.search(params['query']) @fetprofiles=[] # if can?(:showintern, Neuigkeit) diff --git a/app/controllers/meetings_controller.rb b/app/controllers/meetings_controller.rb index c1dbbe2..e6e64a2 100644 --- a/app/controllers/meetings_controller.rb +++ b/app/controllers/meetings_controller.rb @@ -1,8 +1,5 @@ class MeetingsController < ApplicationController - - - load_and_authorize_resource def index parent=params[:parent_type].constantize.find(params[:parent_id]) diff --git a/app/models/ability.rb b/app/models/ability.rb index a575958..cb08fe9 100755 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -120,10 +120,13 @@ class Ability # Calendar if( user.has_role?("fetuser") || user.has_role?("fetadmin")) - can :manage, Document + can [:edit, :update,:new,:create], Document can :manage, Meeting can :manage, Meetingtyp end + if user.has_role?("fetadmin") + can :manage, Document + end if loggedin end can :show, Document, :typ=>11 diff --git a/app/views/home/_search_results.html.erb b/app/views/home/_search_results.html.erb index 5ffbffc..dcfef1d 100644 --- a/app/views/home/_search_results.html.erb +++ b/app/views/home/_search_results.html.erb @@ -1,7 +1,7 @@ <% unless @results.nil? %> <% end %> -<% unless @neuigkeiten.empty? %> -

Neuigkeiten

-<% end %> -<% @neuigkeiten.each do |neuigkeit| %> - -<% end %> - -<% unless @fetprofiles.empty? %> -

Mitarbeiter

-<% end %> - -<% @fetprofiles.each do |fetprofile| %> - -<% end %> - -<% unless @fetprofiles.empty? %> -

Themen

-<% end %> - - +<%= @res %> diff --git a/app/views/layouts/menu.html.erb b/app/views/layouts/menu.html.erb index 9a6d97c..68455b1 100644 --- a/app/views/layouts/menu.html.erb +++ b/app/views/layouts/menu.html.erb @@ -25,7 +25,8 @@
  • <%= link_to 'Intern' , intern_home_index_path %>
  • <% end %> - + +