diff options
| -rw-r--r-- | app/assets/stylesheets/referentials.css.scss | 3 | ||||
| -rw-r--r-- | app/controllers/referentials_controller.rb | 7 | ||||
| -rw-r--r-- | app/models/referential.rb | 4 | ||||
| -rw-r--r-- | app/views/referentials/_line.erb | 6 | ||||
| -rw-r--r-- | app/views/referentials/_referential.erb | 6 | ||||
| -rw-r--r-- | app/views/referentials/index.html.erb | 10 | ||||
| -rw-r--r-- | app/views/referentials/show.html.erb | 2 | ||||
| -rw-r--r-- | spec/views/referentials/show.html.erb_spec.rb | 1 |
8 files changed, 37 insertions, 2 deletions
diff --git a/app/assets/stylesheets/referentials.css.scss b/app/assets/stylesheets/referentials.css.scss new file mode 100644 index 000000000..14c7eef8a --- /dev/null +++ b/app/assets/stylesheets/referentials.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the referentials controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb index a65af2e9a..539c7ca5d 100644 --- a/app/controllers/referentials_controller.rb +++ b/app/controllers/referentials_controller.rb @@ -1,2 +1,9 @@ class ReferentialsController < InheritedResources::Base + + before_filter :switch_referential + + def switch_referential + Apartment::Database.switch(referential.slug) + end + end diff --git a/app/models/referential.rb b/app/models/referential.rb index 36f3df100..430785470 100644 --- a/app/models/referential.rb +++ b/app/models/referential.rb @@ -2,5 +2,9 @@ class Referential < ActiveRecord::Base validates_presence_of :name validates_presence_of :slug + def lines + Chouette::Line.all + end + end diff --git a/app/views/referentials/_line.erb b/app/views/referentials/_line.erb new file mode 100644 index 000000000..04cb65708 --- /dev/null +++ b/app/views/referentials/_line.erb @@ -0,0 +1,6 @@ +<%= div_for(referential) do %> + <%= link_to referential.name, referential %> + <div class="info"> + + </div> +<% end %> diff --git a/app/views/referentials/_referential.erb b/app/views/referentials/_referential.erb new file mode 100644 index 000000000..04cb65708 --- /dev/null +++ b/app/views/referentials/_referential.erb @@ -0,0 +1,6 @@ +<%= div_for(referential) do %> + <%= link_to referential.name, referential %> + <div class="info"> + + </div> +<% end %> diff --git a/app/views/referentials/index.html.erb b/app/views/referentials/index.html.erb new file mode 100644 index 000000000..15d521303 --- /dev/null +++ b/app/views/referentials/index.html.erb @@ -0,0 +1,10 @@ +<%= title_tag Referential.model_name.human.pluralize %> + +<%= render :partial => "referential", :collection => @referentials %> + +<% content_for :sidebar do %> +<ul class="actions"> + <li><%= link_to t('referentials.actions.new'), new_referential_path, :class => "add" %></li> + <br> +</ul> +<% end %> diff --git a/app/views/referentials/show.html.erb b/app/views/referentials/show.html.erb index 9fad647bc..ad48cade5 100644 --- a/app/views/referentials/show.html.erb +++ b/app/views/referentials/show.html.erb @@ -1,4 +1,4 @@ -<%= title_tag t('.title', :title => @referential.name) %> +<%= title_tag @referential.name %> <div> <p> diff --git a/spec/views/referentials/show.html.erb_spec.rb b/spec/views/referentials/show.html.erb_spec.rb index 2f3a64568..30347bae8 100644 --- a/spec/views/referentials/show.html.erb_spec.rb +++ b/spec/views/referentials/show.html.erb_spec.rb @@ -5,7 +5,6 @@ describe "referentials/show.html.erb" do it "should have a title with name" do render - puts render rendered.should have_selector("h2", :text => Regexp.new(referential.name)) end |