merge branch subjects_controller into master

app/controllers/subjects_controller.rb

+class SubjectsController < ApplicationController
+
+  # GET /subjects
+  # GET /subjects.json
+  def index
+    @subjects = subject_repository.all
+  end
+
+  # GET /subjects/1
+  # GET /subjects/1.json
+  def show
+    @subject = subject_repository.find("##{params[:id]}")
+  end
+
+
+
+
+  private
+
+  def subject_repository
+    repository.for(:subject)
+  end
+
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def subject_params
+    params[:subject_object]
+  end
+
+end

app/views/subjects/index.html.erb

+<p id="notice"><%= notice %></p>
+
+<h1>Listing Subject</h1>
+
+
+<%for subject in @subjects%>
+    <%= render 'shared/application/object_vertical', object: subject %>
+<%end%>

app/views/subjects/show.html.erb

+<h1><%= @subject.name %></h1>

config/routes.rb

@@ -8,12 +8,14 @@ Rails.application.routes.draw do
   namespace :management do
     root 'welcome#index'
 
-    # statistics
-    get 'statistics/', to: 'statistics#index', as: 'index_statistics'
-    get 'statistics/users/' => 'statistics#users', as: 'users_statistics'
-    get 'statistics/collections' => 'statistics#collections', as: 'collections_statistics'
-    get 'statistics/accesses' => 'statistics#accesses', as: 'accesses_statistics'
-    get 'statistics/downloads' => 'statistics#downloads', as: 'downloads_statistics'
+    resources :statistics do
+      collection do
+        get :users
+        get :collections
+        get :accesses
+        get :downloads
+      end
+    end
 
     resources :users
     resources :highlights
@@ -21,14 +23,17 @@ Rails.application.routes.draw do
 
   root 'welcome#index'
 
-  resources :learning_objects
-  post '/learning_objects/:id/like' => 'learning_objects#like', as: 'like_learning_object'
+  resources :learning_objects do
+    member do
+      post :like
+    end
+  end
 
   resources :institutions
   resources :collections
+  resources :subjects, only: [:index, :show]
 
   get 'users/:id', to: 'users#show', as: 'users_show'
-
   get '/faq' => 'welcome#faq'
   get '/contact' => 'welcome#contact', as: 'contact'
   get '/complaint' => 'welcome#complaint', as: 'complaint'