forked from bofh/fetsite
AutoCommit Don Sep 3 12:03:05 CEST 2015
This commit is contained in:
@@ -55,7 +55,7 @@ end
|
|||||||
<ul>
|
<ul>
|
||||||
<% @memberships.each do |m| %>
|
<% @memberships.each do |m| %>
|
||||||
<li>
|
<li>
|
||||||
<%= link_to m.gremium do %> <%= render m %><% end %>
|
<%= link_to gremium_path(m.gremium) do %> <%= render m %><% end %>
|
||||||
<%= link_to I18n.t('common.edit'), edit_fetprofile_membership_path(@fetprofile,m) if params["verwalten"] && can?(:edit, m)%>
|
<%= link_to I18n.t('common.edit'), edit_fetprofile_membership_path(@fetprofile,m) if params["verwalten"] && can?(:edit, m)%>
|
||||||
<%= link_to I18n.t('common.delete'), [@fetprofile, m], method: :delete, data: {confirm: I18n.t('common.sure_del')} if params["verwalten"] && can?(:delete, m ) %>
|
<%= link_to I18n.t('common.delete'), [@fetprofile, m], method: :delete, data: {confirm: I18n.t('common.sure_del')} if params["verwalten"] && can?(:delete, m ) %>
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ end
|
|||||||
<ul>
|
<ul>
|
||||||
<% @memberships.each do |m| %>
|
<% @memberships.each do |m| %>
|
||||||
<li>
|
<li>
|
||||||
<%= link_to m.gremium do %> <%= render m %><% end %>
|
<%= link_to gremium_path(m.gremium) do %> <%= render m %><% end %>
|
||||||
<%= link_to I18n.t('common.edit'), edit_fetprofile_membership_path(@fetprofile,m) if params["verwalten"] && can?(:edit, m)%>
|
<%= link_to I18n.t('common.edit'), edit_fetprofile_membership_path(@fetprofile,m) if params["verwalten"] && can?(:edit, m)%>
|
||||||
<%= link_to I18n.t('common.delete'), [@fetprofile, m], method: :delete, data: {confirm: I18n.t('common.sure_del')} if params["verwalten"] && can?(:delete, m ) %>
|
<%= link_to I18n.t('common.delete'), [@fetprofile, m], method: :delete, data: {confirm: I18n.t('common.sure_del')} if params["verwalten"] && can?(:delete, m ) %>
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
@@ -15,7 +15,12 @@
|
|||||||
get 'internlist'
|
get 'internlist'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
resources :gremien do
|
||||||
|
collection do
|
||||||
|
get 'verwalten'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
#
|
||||||
# #-------------------------
|
# #-------------------------
|
||||||
|
|
||||||
namespace :survey do
|
namespace :survey do
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
# Read about factories at https://github.com/thoughtbot/factory_girl
|
# Read about factories at https://github.com/thoughtbot/factory_girl
|
||||||
|
|
||||||
FactoryGirl.define do
|
FactoryGirl.define do
|
||||||
factory :gremium do
|
factory :gremium do
|
||||||
name "MyString"
|
name "Kommission"
|
||||||
desc "MyText"
|
desc "Das ist eine Kommission die sich mit irgendwas beschäftigt"
|
||||||
typ "MyString"
|
typ 1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -2,10 +2,10 @@
|
|||||||
|
|
||||||
FactoryGirl.define do
|
FactoryGirl.define do
|
||||||
factory :membership do
|
factory :membership do
|
||||||
fetprofile_id "MyString"
|
fetprofile_id 1
|
||||||
gremium_id "MyString"
|
gremium_id 1
|
||||||
start "2013-08-19"
|
start "2013-08-19"
|
||||||
stop "2013-08-19"
|
stop "2013-08-23"
|
||||||
typ "MyString"
|
typ 1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -13,8 +13,12 @@ describe "fetprofiles/show", :type => :view do
|
|||||||
default_url_options[:locale] = :de
|
default_url_options[:locale] = :de
|
||||||
@fetprofile = FactoryGirl.create(:fetprofile_withadress)
|
@fetprofile = FactoryGirl.create(:fetprofile_withadress)
|
||||||
assign(:fetprofile,@fetprofile)
|
assign(:fetprofile,@fetprofile)
|
||||||
assign(:memberships, [])
|
@gremium = FactoryGirl.create(:gremium)
|
||||||
assign(:gremientabs, [])
|
@gremium2 = FactoryGirl.create(:gremium, name:"Kommission2")
|
||||||
|
@gremium3 = FactoryGirl.create(:gremium, name:"Kommission3", typ: 2)
|
||||||
|
|
||||||
|
assign(:memberships, [FactoryGirl.create(:membership,gremium_id: @gremium.id, fetprofile_id: @fetprofile.id)])
|
||||||
|
assign(:gremientabs, [@gremium2])
|
||||||
# view.theme "blue2"
|
# view.theme "blue2"
|
||||||
end
|
end
|
||||||
def self.login_fet_user
|
def self.login_fet_user
|
||||||
@@ -82,6 +86,19 @@ end
|
|||||||
expect(rendered).not_to match(/#{@fetprofile.plz}/)
|
expect(rendered).not_to match(/#{@fetprofile.plz}/)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
it "renders links to gremium" do
|
||||||
|
render
|
||||||
|
expect(rendered).to match(/#{gremium_path(@gremium)}/)
|
||||||
|
end
|
||||||
|
it "renders gremium links" do
|
||||||
|
render
|
||||||
|
expect(rendered).to match(/#{gremium_path(@gremium2)}/)
|
||||||
|
end
|
||||||
|
it "doesn't render gremium links for hidden gremium" do
|
||||||
|
render
|
||||||
|
expect(rendered).not_to match(/#{gremium_path(@gremium3)}/)
|
||||||
|
end
|
||||||
|
|
||||||
describe "with fet user" do
|
describe "with fet user" do
|
||||||
login_fet_user
|
login_fet_user
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user