forked from bofh/fetsite
AutoCommit Fre Jul 10 11:03:02 CEST 2015
This commit is contained in:
@@ -12,9 +12,14 @@
|
||||
<div class="span6">
|
||||
<%= f.input :flag_important, :placeholder=> "Titel" %>
|
||||
</div>
|
||||
<div class="span12">
|
||||
<div class="row-fluid">
|
||||
|
||||
<div class="span8">
|
||||
<%= f.input :text, :as=> :tinymce_text %>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<%= if I18n.locale == :en %>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row-fluid">
|
||||
|
||||
@@ -33,10 +33,11 @@
|
||||
|
||||
|
||||
scope '(:locale)', constraints: {:locale=>/en|de/i} do
|
||||
get 't/:theme/:url', to: redirect('/%{url}')
|
||||
scope '(t/:theme)' do
|
||||
get "" , controller: :home, action: :index
|
||||
get "intern" , controller: :home, action: :intern
|
||||
|
||||
get "beispielsammlung", to: redirect('/studien')
|
||||
scope '(:ansicht)' do
|
||||
resources :studien, :only=>[:new,:edit,:update,:destroy,:show] do
|
||||
member do
|
||||
@@ -101,13 +102,18 @@
|
||||
get 'verwalten'
|
||||
end
|
||||
end
|
||||
resources :fetprofiles do
|
||||
resources :fetprofiles, as: :fetprofiles_bak do
|
||||
collection do
|
||||
get 'verwalten'
|
||||
get 'internlist'
|
||||
end
|
||||
end
|
||||
resources :members , controller: :fetprofiles , as: :fetprofiles do
|
||||
collection do
|
||||
get 'verwalten'
|
||||
get 'internlist'
|
||||
end
|
||||
end
|
||||
|
||||
resources :fragen, :only =>[:new, :edit, :update, :destroy, :create]
|
||||
|
||||
|
||||
|
||||
6
db/migrate/20150710082704_add_sid_to_themen.rb
Normal file
6
db/migrate/20150710082704_add_sid_to_themen.rb
Normal file
@@ -0,0 +1,6 @@
|
||||
class AddSidToThemen < ActiveRecord::Migration
|
||||
def change
|
||||
add_column :themen,:sid, :string
|
||||
add_index :themen,:sid, unique: true
|
||||
end
|
||||
end
|
||||
Reference in New Issue
Block a user