diff --git a/app/controllers/fetprofiles_controller.rb b/app/controllers/fetprofiles_controller.rb index fc8e881..ae58913 100644 --- a/app/controllers/fetprofiles_controller.rb +++ b/app/controllers/fetprofiles_controller.rb @@ -9,6 +9,7 @@ class FetprofilesController < ApplicationController @fetprofiles = Fetprofile.order(:vorname,:nachname) if params[:filter]== "all" @fetprofiles = Fetprofile.where(:active=>false).order(:nachname,:vorname) if params[:filter]== "notactive" + @gremientabs = Gremium.tabs @toolbar_elements << {:hicon=>'icon-plus', :text=> I18n.t('profile.new_profile'),:path => new_fetprofile_path(@fetprofile) } if can? :new, @fetprofile @@ -16,11 +17,11 @@ class FetprofilesController < ApplicationController format.html # index.html.erb end end + def internlist @fetprofiles = Fetprofile.order(:vorname,:nachname) end - # GET /fetprofiles/1 # GET /fetprofiles/1.json def show diff --git a/app/controllers/gremien_controller.rb b/app/controllers/gremien_controller.rb index 6612e8c..93c3b42 100644 --- a/app/controllers/gremien_controller.rb +++ b/app/controllers/gremien_controller.rb @@ -33,7 +33,7 @@ class GremienController < ApplicationController def show @gremium = Gremium.find(params[:id]) @gremientabs=Gremium.tabs -@memberships=@gremium.memberships.active.includes(:fetprofile).order(:typ,"fetprofiles.vorname","fetprofiles.nachname") + @memberships=@gremium.memberships.active.includes(:fetprofile).order(:typ,"fetprofiles.vorname","fetprofiles.nachname") respond_to do |format| format.html # show.html.erb diff --git a/app/views/fetprofiles/_compact.html.erb b/app/views/fetprofiles/_compact.html.erb index fe1f3df..bd4fe07 100644 --- a/app/views/fetprofiles/_compact.html.erb +++ b/app/views/fetprofiles/_compact.html.erb @@ -1,7 +1,7 @@
| Name |
|---|