Merge FROM CDL-MVP

.gitignore

@@ -28,6 +28,7 @@ db/data.yml
 
 # Ignore the test DB
 db/test.sqlite3
+db/test.sqlite3-journal
 
 # Ignore the SimpleCov output
 coverage
@@ -64,4 +65,4 @@ config/initializers/wicked_pdf.rb
 
 # ignore auto-generated gettext files when running gettext:find
 config/locale/*/app.edit.po
-config/locale/*/app.po.time_stamp
+config/locale/*/app.po.time_stamp

Gemfile

@@ -60,7 +60,6 @@ gem 'sass-rails'
 gem 'less-rails'                        # WE SHOULD PROBABLY USE SASS OR LESS NOT BOTH
 gem 'jquery-rails'
 gem 'font-awesome-rails'
-gem 'twitter-bootstrap-rails', '2.2.8'
 gem 'tinymce-rails'                     # WYSIWYG EDITOR
 gem 'contact_us', '>= 1.2.0' # COULD BE EASILY REPLACED WITH OUR OWN CODE
 gem 'recaptcha', '>= 4.0'

Gemfile.lock

@@ -174,7 +174,7 @@ GEM
       activerecord (>= 3.1)
     less (2.6.0)
       commonjs (~> 0.2.7)
-    less-rails (2.7.1)
+    less-rails (2.8.0)
       actionpack (>= 4.0)
       less (~> 2.6.0)
       sprockets (> 2, < 4)
@@ -322,11 +322,6 @@ GEM
     tilt (2.0.5)
     tinymce-rails (4.4.3)
       railties (>= 3.1.1)
-    twitter-bootstrap-rails (2.2.8)
-      actionpack (>= 3.1)
-      execjs
-      rails (>= 3.1)
-      railties (>= 3.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (3.0.2)
@@ -399,7 +394,6 @@ DEPENDENCIES
   therubyracer (>= 0.11.4)
   thin
   tinymce-rails
-  twitter-bootstrap-rails (= 2.2.8)
   uglifier
   web-console (~> 2.0)
   webmock

README.md

@@ -21,8 +21,7 @@ Roadmap is a Ruby on Rails application and you will need to have:
 * Rails >= 4.2
 * MySql >= 5.0 OR PostgreSql
 
-#### Migrating data from a running instance of DMPOnline_v4 or DMPTool
-Migration instructions will be coming soon
+Further detail on how to install Ruby on Rails applications are available from the Ruby on Rails site: http://rubyonrails.org
 
 Further details on how to install MySQL and create your first user and database. Be sure to follow the instructions for your particular environment. 
 * Install: http://dev.mysql.com/downloads/mysql/

app/controllers/annotations_controller.rb

@@ -18,7 +18,8 @@ def admin_create
     guid_save = guidance.present? ? guidance.save : true
 
     if ex_save && guid_save
-      redirect_to admin_show_phase_path(id: @question.section.phase_id, section_id: @question.section_id, question_id: @question.id, edit: 'true'), notice: _('Information was successfully created.')
+      typ = (example_answer.present? && guidance.present? ? 'example answer and guidance' : (guidance.present? ? 'guidance' : 'example answer'))
+      redirect_to admin_show_phase_path(id: @question.section.phase_id, section_id: @question.section_id, question_id: @question.id, edit: 'true'), notice: success_message(typ, _('created'))
     else
       @section = @question.section
       @phase = @section.phase
@@ -27,12 +28,12 @@ def admin_create
       @section_id = @section.id
       @question_id = @example_answer.question
       if !ex_save && !guid_save
-        flash[:notice] = failed_create_error(example_answer, _('example answer')) + '\n' +
+        flash[:alert] = failed_create_error(example_answer, _('example answer')) + '\n' +
                           failed_create_error(gudiance, _('guidance'))
       elsif !guid_save
-        flash[:notice] = failed_create_error(gudiance, _('guidance'))
+        flash[:alert] = failed_create_error(gudiance, _('guidance'))
       elsif !ex_save
-        flash[:notice] = failed_create_error(example_answer, _('example answer'))
+        flash[:alert] = failed_create_error(example_answer, _('example answer'))
       end
       render "phases/admin_show"
     end
@@ -74,15 +75,16 @@ def admin_update
     @section = @question.section
     @phase = @section.phase
     if ex_save && guid_save
-      redirect_to admin_show_phase_path(id: @phase.id, section_id: @section.id, question_id: @question.id, edit: 'true'), notice: _('Information was successfully updated.')
+      typ = (example_answer.present? && guidance.present? ? 'example answer and guidance' : (guidance.present? ? 'guidance' : 'example answer'))
+      redirect_to admin_show_phase_path(id: @phase.id, section_id: @section.id, question_id: @question.id, edit: 'true'), notice: success_message(typ, _('saved'))
     else
       if !ex_save && !guid_save
-        flash[:notice] = failed_create_error(example_answer, _('example answer')) + '\n' +
+        flash[:alert] = failed_create_error(example_answer, _('example answer')) + '\n' +
                           failed_create_error(gudiance, _('guidance'))
       elsif !guid_save
-        flash[:notice] = failed_create_error(gudiance, _('guidance'))
+        flash[:alert] = failed_create_error(gudiance, _('guidance'))
       elsif !ex_save
-        flash[:notice] = failed_create_error(example_answer, _('example answer'))
+        flash[:alert] = failed_create_error(example_answer, _('example answer'))
       end
       render action: "phases/admin_show"
     end
@@ -96,9 +98,9 @@ def admin_destroy
     @section = @question.section
     @phase = @section.phase
     if @example_answer.destroy
-      redirect_to admin_show_phase_path(id: @phase.id, section_id: @section.id, edit: 'true'), notice: _('Information was successfully deleted.')
+      redirect_to admin_show_phase_path(id: @phase.id, section_id: @section.id, edit: 'true'), notice: success_message(_('information'), _('deleted'))
     else
-      redirect_to admin_show_phase_path(id: @phase.id, section_id: @section.id, edit: 'true'), notice: flash[:notice] = failed_destroy_error(@example_answer, _('example answer'))
+      redirect_to admin_show_phase_path(id: @phase.id, section_id: @section.id, edit: 'true'), notice: flash[:alert] = failed_destroy_error(@example_answer, _('example answer'))
     end
   end
 

app/controllers/application_controller.rb

@@ -13,7 +13,7 @@ class ApplicationController < ActionController::Base
 
   def user_not_authorized
     if user_signed_in?
-      redirect_to plans_url, notice: _('You are not authorized to perform this action.')
+      redirect_to plans_url, alert: _('You are not authorized to perform this action.')
     else
       redirect_to root_url, alert: _('You need to sign in or sign up before continuing.')
     end
@@ -80,6 +80,10 @@ def failed_update_error(obj, obj_name)
   def failed_destroy_error(obj, obj_name)
     "#{_('Could not delete the %{o}.') % {o: obj_name}} #{errors_to_s(obj)}"
   end
+
+  def success_message(obj_name, action)
+    "#{_('Successfully %{action} your %{object}.') % {object: obj_name, action: action}}"
+  end
 
   private
     # Override rails default render action to look for a branded version of a

app/controllers/guidance_groups_controller.rb

@@ -27,9 +27,9 @@ def admin_create
     end
 
     if @guidance_group.save
-      redirect_to admin_index_guidance_path, notice: _('Guidance group was successfully created.')
+      redirect_to admin_index_guidance_path, notice: success_message(_('guidance group'), _('created'))
     else
-      flash[:notice] = failed_create_error(@guidance_group, _('guidance group'))
+      flash[:alert] = failed_create_error(@guidance_group, _('guidance group'))
       render 'admin_new'
     end
   end
@@ -50,9 +50,9 @@ def admin_update
     @guidance_group.published = true unless params[:save_publish].nil?
 
     if @guidance_group.update_attributes(params[:guidance_group])
-      redirect_to admin_index_guidance_path(params[:guidance_group]), notice: _('Guidance group was successfully updated.')
+      redirect_to admin_index_guidance_path(params[:guidance_group]), notice: success_message(_('guidance group'), _('saved'))
     else
-      flash[:notice] = failed_update_error(@guidance_group, _('guidance group'))
+      flash[:alert] = failed_update_error(@guidance_group, _('guidance group'))
       render 'admin_edit'
     end
   end
@@ -66,9 +66,9 @@ def admin_update_publish
     @guidance_group.published = true
 
     if @guidance_group.update_attributes(params[:guidance_group])
-      redirect_to admin_index_guidance_path(params[:guidance_group]), notice: _('Guidance group was successfully updated.')
+      redirect_to admin_index_guidance_path(params[:guidance_group]), notice: success_message(_('guidance group'), _('saved'))
     else
-      redirect_to admin_index_guidance_path(@guidance_group), notice: failed_update_error(@guidance_group, _('guidance group'))
+      redirect_to admin_index_guidance_path(@guidance_group), alert: failed_update_error(@guidance_group, _('guidance group'))
     end
   end
 
@@ -79,9 +79,9 @@ def admin_destroy
     @guidance_group = GuidanceGroup.find(params[:id])
     authorize @guidance_group
     if @guidance_group.destroy
-      redirect_to admin_index_guidance_path, notice: _('Guidance group was successfully deleted.')
+      redirect_to admin_index_guidance_path, notice: success_message(_('guidance group'), _('deleted'))
     else
-      redirect_to admin_index_guidance_path, notice: failed_destroy_error(@guidance_group, _('guidance group'))
+      redirect_to admin_index_guidance_path, alert: failed_destroy_error(@guidance_group, _('guidance group'))
     end
   end
 

app/controllers/guidances_controller.rb

@@ -10,19 +10,12 @@ def admin_index
     @guidance_groups = GuidanceGroup.where(org_id: current_user.org_id)
   end
 
-  ##
-  # GET /guidances/1
-  def admin_show
-    @guidance = Guidance.eager_load(:guidance_group, :themes).find(params[:id])
-    authorize @guidance
-  end
-
   def admin_new
     @guidance = Guidance.new
     authorize @guidance
     @themes = Theme.all.order('title')
     @guidance_groups = GuidanceGroup.where(org_id: current_user.org_id).order('name ASC')
-	end
+  end
 
   ##
   # GET /guidances/1/edit
@@ -46,9 +39,9 @@ def admin_create
     end
 
     if @guidance.save
-      redirect_to admin_show_guidance_path(@guidance), notice: _('Guidance was successfully created.')
+      redirect_to admin_edit_guidance_path(@guidance), notice: success_message(_('guidance'), _('created'))
     else
-      flash[:notice] = failed_create_error(@guidance, _('guidance'))
+      flash[:alert] = failed_create_error(@guidance, _('guidance'))
       @themes = Theme.all.order('title')
       @guidance_groups = GuidanceGroup.where(org_id: current_user.org_id).order('name ASC')
       render action: "admin_new"
@@ -58,13 +51,14 @@ def admin_create
   ##
   # PUT /guidances/1
   def admin_update
- 		@guidance = Guidance.find(params[:id])
+    @guidance = Guidance.find(params[:id])
     authorize @guidance
-		@guidance.text = params["guidance-text"]
+    @guidance.text = params["guidance-text"]
+
     if @guidance.update_attributes(guidance_params)
-      redirect_to admin_show_guidance_path(params[:guidance]), notice: _('Guidance was successfully updated.')
+      redirect_to admin_edit_guidance_path(params[:guidance]), notice: success_message(_('guidance'), _('saved'))
     else
-      flash[:notice] = failed_update_error(@guidance, _('guidance'))
+      flash[:alert] = failed_update_error(@guidance, _('guidance'))
       @themes = Theme.all.order('title')
       @guidance_groups = GuidanceGroup.where(org_id: current_user.org_id).order('name ASC')
 
@@ -75,14 +69,14 @@ def admin_update
   ##
   # DELETE /guidances/1
   def admin_destroy
-   	@guidance = Guidance.find(params[:id])
+     @guidance = Guidance.find(params[:id])
     authorize @guidance
     if @guidance.destroy
-      redirect_to admin_index_guidance_path, notice: _('Guidance was successfully deleted.')
+      redirect_to admin_index_guidance_path, notice: success_message(_('guidance'), _('deleted'))
     else
-      redirect_to admin_index_guidance_path, notice: failed_destroy_error(@guidance, _('guidance'))
+      redirect_to admin_index_guidance_path, alert: failed_destroy_error(@guidance, _('guidance'))
     end
-	end
+  end
 
 
   private

app/controllers/notes_controller.rb

@@ -34,7 +34,7 @@ def create
 
     if @note.save
       @status = true
-      @notice = _('Comment was successfully created.')
+      @notice = success_message(_('comment'), _('created'))
     else
       @status = false
       @notice = failed_create_error(@note, _('note'))
@@ -55,7 +55,7 @@ def update
     @plan = @answer.plan
 
     if @note.update_attributes(params[:note])
-      @notice = _('Comment was successfully saved.')
+      @notice = success_message(_('comment'), _('saved'))
     else
       @notice = failed_update_error(@note, _('note'))
     end
@@ -74,7 +74,7 @@ def archive
     @plan = @answer.plan
 
     if @note.update_attributes(params[:note])
-      @notice = _('Comment removed.')
+      @notice = success_message(_('comment'), _('removed'))
     else
       @notice = failed_destroy_error(@note, _('note'))
     end

app/controllers/orgs_controller.rb

@@ -1,14 +1,7 @@
 class OrgsController < ApplicationController
-  after_action :verify_authorized
+  after_action :verify_authorized, except: ['shibboleth_ds', 'shibboleth_ds_passthru']
   respond_to :html
 
-  ##
-  # GET /organisations/1
-  def admin_show
-    @org = Org.find(params[:id])
-    authorize @org
-  end
-
   ##
   # GET /organisations/1/edit
   def admin_edit
@@ -28,22 +21,65 @@ def admin_update
 
     begin
       if @org.update_attributes(org_params)
-        redirect_to admin_show_org_path(params[:id]), notice: _('Organisation was successfully updated.')
+        flash[:notice] = success_message(_('organisation'), _('saved'))
+        render action: "admin_edit" 
       else
         # For some reason our custom validator returns as a string and not a hash like normal activerecord 
         # errors. We followed the example provided in the Rails guides when building the validator so
         # its unclear why its doing this. Placing a check here for the data type. We should reasses though
         # when doing a broader eval of the look/feel of the site and we come up with a standardized way of
         # displaying errors
-        flash[:notice] = failed_update_error(@org, _('organisation'))
+        flash[:alert] = failed_update_error(@org, _('organisation'))
         render action: "admin_edit"
       end
     rescue Dragonfly::Job::Fetch::NotFound => dflye
-      flash[:notice] = _('There seems to be a problem with your logo. Please upload it again.')
+      flash[:alert] = _('There seems to be a problem with your logo. Please upload it again.')
       render action: "admin_edit"
     end
   end
 
+  # GET /orgs/shibboleth_ds
+  # ----------------------------------------------------------------
+  def shibboleth_ds
+    redirect_to root_path unless current_user.nil?
+
+    @user = User.new
+    # Display the custom Shibboleth discovery service page. 
+    @orgs = Org.joins(:identifier_schemes).where('identifier_schemes.name = ?', 'shibboleth').sort{|x,y| x.name <=> y.name }
+
+    if @orgs.empty?
+      flash[:alert] = _('No institutions are currently registered.')
+      redirect_to user_shibboleth_omniauth_authorize_path 
+    end
+  end
+
+  # POST /orgs/shibboleth_ds
+  # ----------------------------------------------------------------
+  def shibboleth_ds_passthru
+    if !params[:org_name].blank?
+      session['org_id'] = params[:org_name]
+
+      scheme = IdentifierScheme.find_by(name: 'shibboleth')
+      shib_entity = OrgIdentifier.where(org_id: params[:org_name], identifier_scheme: scheme)
+
+      if !shib_entity.empty?
+        # Force SSL
+        url = "#{request.base_url.gsub('http:', 'https:')}#{Rails.application.config.shibboleth_login}"
+        target = "#{user_shibboleth_omniauth_callback_url.gsub('http:', 'https:')}"
+
+        #initiate shibboleth login sequence
+        redirect_to "#{url}?target=#{target}&entityID=#{shib_entity.first.identifier}"
+      else
+        flash[:alert] = _('Your institution does not seem to be properly configured.')
+        redirect_to shibboleth_ds_path
+      end
+
+    else
+      flash[:notice] = _('Please choose an institution')
+      redirect_to shibboleth_ds_path
+    end
+  end
+
   private
     def org_params
       params.require(:org).permit(:name, :abbreviation, :target_url, :is_other, :banner_text, :language_id,