This commit is contained in:
Thomas Blazek
2013-07-29 17:46:10 +02:00
parent 104437bbdf
commit 747ba5f91a
3 changed files with 43 additions and 53 deletions

View File

@@ -1,25 +1,20 @@
<p id="notice"><%= notice %></p> <p id="notice"><%= notice %></p>
<p> <p>
<b>Name:</b> <b>Name:</b> <%= @semester.name %>
<%= @semester.name %>
</p> </p>
<p> <p>
<b>Nummer:</b> <b>Nummer:</b> <%= @semester.nummer %>
<%= @semester.nummer %>
</p> </p>
<p> <p>
<b>Ws:</b> <b>WS/SS?:</b> <%= @semester.ssws %>
<%= @semester.ws %>
</p> </p>
<p> <p>
<b>Ss:</b> <%= render :partial =>'lvas/lva_semester', :collection=>@semester.lvas, :as=>:lva%>
<%= @semester.ss %>
</p> </p>
<%= link_to 'Edit', edit_semester_path(@semester) %> | <%= link_to 'Edit', edit_semester_path(@semester) %> |
<%= link_to 'Back', semesters_path %> <%= link_to 'Back', semesters_path %>

View File

@@ -1,8 +1,5 @@
Fetsite::Application.routes.draw do Fetsite::Application.routes.draw do
devise_for :users devise_for :users
resources :home, :only=>[:index] resources :home, :only=>[:index]
#get 'home',:controller=>home,:action=>:index,:as=>"home_index" #get 'home',:controller=>home,:action=>:index,:as=>"home_index"
@@ -11,19 +8,17 @@ Fetsite::Application.routes.draw do
get 'config',:controller=>:config,:action=>:index , :as => 'config' get 'config',:controller=>:config,:action=>:index , :as => 'config'
get 'config/get_git_update',:controller=>:config,:action=>:get_git_update, :as=>'config_getgitupdate' get 'config/get_git_update',:controller=>:config,:action=>:get_git_update, :as=>'config_getgitupdate'
get 'config/get_git_update',:controller=>:config,:action=>:get_git_update get 'config/get_git_update',:controller=>:config,:action=>:get_git_update
end
devise_for :users
end resources :pages, :except => [:index] do
devise_for :users
resources :pages, :except => [:index] do
member do member do
post 'preview' post 'preview'
end end
end end
get 'pages', :to =>'pages#show' get 'pages', :to =>'pages#show'
scope '(:locale)' do scope '(:locale)' do
resources :studien, :only=>[:show,:new,:edit,:update,:destroy] resources :studien, :only=>[:show,:new,:edit,:update,:destroy]
resources :modulgruppen,:only =>[:create,:index] resources :modulgruppen,:only =>[:create,:index]
resources :studien,:except=>[:show,:new,:edit,:update,:destroy], :shallow=>true do resources :studien,:except=>[:show,:new,:edit,:update,:destroy], :shallow=>true do