Fix SunSpot and minor fix in calentry
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
class CalentriesController < ApplicationController
|
||||
# GET /calentries
|
||||
# GET /calentries.json
|
||||
#load_and_authorize_resource
|
||||
load_and_authorize_resource
|
||||
def index
|
||||
|
||||
|
||||
|
||||
@@ -35,8 +35,8 @@ class Ability
|
||||
#-----------------------------------------------------
|
||||
# Rechteverwaltung fuer Informationen
|
||||
can [:show, :index,:faqs], Themengruppe, :public=>true
|
||||
can [:show], Thema, :isdraft=>false
|
||||
can :show, Frage
|
||||
can [:show], Thema, :isdraft=>false, :themengruppe=>{:public=>true}
|
||||
can :show, Frage
|
||||
if loggedin
|
||||
end
|
||||
if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
<%= link_to res, :class=>:linkbox do %>
|
||||
<%= render :partial=>res.class.to_s.pluralize.downcase+"/nlink", :object=>res %>
|
||||
<% end %>
|
||||
|
||||
</li>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
@@ -50,7 +50,7 @@ end
|
||||
<%= render ce unless ce.nil? %>
|
||||
<% end %>
|
||||
</div>
|
||||
<div id="calentry_new" ><%= link_to "new Calentry", new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), :remote=>true %></div>
|
||||
<div id="calentry_new" ><%= link_to "new Calentry", new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), :remote=>true if can? :edit, @neuigkeit %></div>
|
||||
<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
|
||||
</div>
|
||||
<%= render partial: 'nlink_list_whole', :object=>@neuigkeit.nlinks %>
|
||||
|
||||
Reference in New Issue
Block a user