diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1b13b64..008e253 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -68,25 +68,6 @@ redirect_to root_path unless user_signed_in? && (current_user.can_add_orgs? || current_user.can_change_org? || current_user.can_super_admin?) end - def get_plan_list_columns - if user_signed_in? - @selected_columns = current_user.settings(:plan_list).columns - - # handle settings saved and stored using an older version of the settings gem - if @selected_columns.kind_of? Hash - unless @selected_columns['elements'].nil? - @selected_columns = @selected_columns['elements'].collect{|k,v| puts "#{k} - #{v}"; k} - end - end - - # If the settings are missing or stored in the wrong format for some reason - # then use the defaults columns - @selected_columns = Settings::PlanList::DEFAULT_COLUMNS if @selected_columns.empty? - - @all_columns = Settings::PlanList::ALL_COLUMNS - end - end - def failed_create_error(obj, obj_name) "#{_('Could not create your %{o}.') % {o: obj_name}} #{errors_to_s(obj)}" end @@ -113,7 +94,15 @@ def errors_to_s(obj) if obj.errors.count > 0 - "
#{obj.errors.collect{|e,m| "#{_(e)} - #{_(m)}"}.join("
")}" + msg = "
" + obj.errors.each do |e,m| + if m.include?('empty') || m.include?('blank') + msg += "#{_(e)} - #{_(m)}
" + else + msg += "'#{obj[e]}' - #{_(m)}
" + end + end + msg end end end diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb deleted file mode 100644 index 8070b25..0000000 --- a/app/controllers/confirmations_controller.rb +++ /dev/null @@ -1,9 +0,0 @@ -class ConfirmationsController < Devise::ConfirmationsController - - protected - - def after_confirmation_path_for(resource_name, resource) - root_path - end - -end \ No newline at end of file diff --git a/app/controllers/phases_controller.rb b/app/controllers/phases_controller.rb index de50db4..858b66a 100644 --- a/app/controllers/phases_controller.rb +++ b/app/controllers/phases_controller.rb @@ -162,6 +162,9 @@ @phase.description = params["phase-desc"] @phase.modifiable = true if @phase.save + @phase.template.dirty = true + @phase.template.save! + redirect_to admin_show_phase_path(id: @phase.id, edit: 'true'), notice: _('Information was successfully created.') else flash[:notice] = failed_create_error(@phase, _('phase')) @@ -177,6 +180,9 @@ authorize @phase @phase.description = params["phase-desc"] if @phase.update_attributes(params[:phase]) + @phase.template.dirty = true + @phase.template.save! + redirect_to admin_show_phase_path(@phase), notice: _('Information was successfully updated.') else @sections = @phase.sections @@ -198,6 +204,9 @@ authorize @phase @template = @phase.template if @phase.destroy + @template.dirty = true + @template.save! + redirect_to admin_template_template_path(@template), notice: _('Information was successfully deleted.') else @sections = @phase.sections diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb index e0f6648..140b90f 100644 --- a/app/controllers/plans_controller.rb +++ b/app/controllers/plans_controller.rb @@ -4,7 +4,6 @@ #Uncomment the line below in order to add authentication to this page - users without permission will not be able to add new plans #load_and_authorize_resource # - before_filter :get_plan_list_columns, only: %i( index ) after_action :verify_authorized @@ -38,8 +37,7 @@ def create @plan = Plan.new authorize @plan - @plan.save - + message = "" # if we have a template_id we've been selcting between templates, otherwise funders @@ -56,8 +54,12 @@ funder_templates = get_most_recent( funder.templates.where(published: true).all ) # get org templates and index by customization id - orgtemplates = get_most_recent( current_user.org.templates.all ) - + if current_user.org.nil? + orgtemplates = [] + else + orgtemplates = get_most_recent( current_user.org.templates.all ) + end + orgt_by_customization = orgtemplates.collect{|t| [t.customization_of, t]}.to_h # go through funder templates and replace with org cusomizations if needed @@ -69,6 +71,7 @@ @templates << ft end end + else # either didn't select funder or selected "No Funder" # get all org @templates which are not customisations @@ -105,13 +108,12 @@ @plan.title = _('My plan')+' ('+@plan.template.title+')' # We should use interpolated string since the order of the words from this message could vary among languages - @plan.assign_creator(current_user.id) - @all_guidance_groups = @plan.get_guidance_group_options @selected_guidance_groups = @plan.guidance_groups.pluck(:id) respond_to do |format| if @plan.save + @plan.assign_creator(current_user.id) flash.notice = _('Plan was successfully created.') + message format.html { redirect_to({:action => "show", :id => @plan.id, :editing => true }) } else diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index aaa02e1..ea11160 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -2,9 +2,6 @@ # TODO: Delete this controller! It is no longer in use and `rake routes` does not even map to this any longer - - - before_filter :get_plan_list_columns, only: %i( index ) after_action :verify_authorized # GET /projects diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb index 47f9a11..6ed74f3 100644 --- a/app/controllers/questions_controller.rb +++ b/app/controllers/questions_controller.rb @@ -9,6 +9,9 @@ @question.guidance = params["new-question-guidance"] @question.default_value = params["new-question-default-value"] if @question.save + @question.section.phase.template.dirty = true + @question.section.phase.template.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.') else @edit = (@question.section.phase.template.org == current_user.org) @@ -33,6 +36,9 @@ @section = @question.section @phase = @section.phase if @question.update_attributes(params[:question]) + @question.section.phase.template.dirty = true + @question.section.phase.template.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.') else @edit = (@phase.template.org == current_user.org) @@ -53,6 +59,9 @@ @section = @question.section @phase = @section.phase if @question.destroy + @phase.template.dirty = true + @phase.template.save! + redirect_to admin_show_phase_path(id: @phase.id, section_id: @section.id, edit: 'true'), notice: _('Information was successfully deleted.') else redirect_to admin_show_phase_path(id: @phase.id, section_id: @section.id, edit: 'true'), notice: failed_destroy_error(@question, 'question') diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 8f12488..1cd51ea 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -52,6 +52,7 @@ if resource.active_for_authentication? set_flash_message :notice, :signed_up if is_navigational_format? sign_up(resource_name, resource) + UserMailer.welcome_notification(current_user).deliver respond_with resource, location: after_sign_up_path_for(resource) else set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}" if is_navigational_format? diff --git a/app/controllers/sections_controller.rb b/app/controllers/sections_controller.rb index e05418c..9880863 100644 --- a/app/controllers/sections_controller.rb +++ b/app/controllers/sections_controller.rb @@ -10,6 +10,9 @@ @section.modifiable = true @phase = @section.phase if @section.save + @section.phase.template.dirty = true + @section.phase.template.save! + redirect_to admin_show_phase_path(id: @section.phase_id, :section_id => @section.id, edit: 'true'), notice: _('Information was successfully created.') else @@ -31,6 +34,9 @@ @section.description = params["section-desc-#{params[:id]}"] @phase = @section.phase if @section.update_attributes(params[:section]) + @section.phase.template.dirty = true + @section.phase.template.save! + redirect_to admin_show_phase_path(id: @phase.id, section_id: @section.id , edit: 'true'), notice: _('Information was successfully updated.') else @edit = (@phase.template.org == current_user.org) @@ -49,7 +55,11 @@ @section = Section.includes(phase: :template).find(params[:section_id]) authorize @section @phase = @section.phase + if @section.destroy + @phase.template.dirty = true + @phase.template.save! + redirect_to admin_show_phase_path(id: @phase.id, edit: 'true' ), notice: _('Information was successfully deleted.') else @edit = (@phase.template.org == current_user.org) diff --git a/app/controllers/settings/plans_controller.rb b/app/controllers/settings/plans_controller.rb index c9be594..c406401 100644 --- a/app/controllers/settings/plans_controller.rb +++ b/app/controllers/settings/plans_controller.rb @@ -1,7 +1,6 @@ module Settings class PlansController < SettingsController - before_filter :get_plan_list_columns before_filter :get_settings after_action :verify_authorized diff --git a/app/controllers/settings/projects_controller.rb b/app/controllers/settings/projects_controller.rb deleted file mode 100644 index 8b0f800..0000000 --- a/app/controllers/settings/projects_controller.rb +++ /dev/null @@ -1,46 +0,0 @@ -module Settings - class ProjectsController < SettingsController - - before_filter :get_plan_list_columns - before_filter :get_settings - - after_action :verify_authorized - - def show - authorize [:settings, Project] - respond_to do |format| - format.html - - format.json{ render json: settings_json } - end - end - - def update - authorize [:settings, Project] - columns = (params[:columns] || {}) - - if @settings.update_attributes(columns: columns) - respond_to do |format| - format.html { redirect_to(projects_path) } - - format.json{ render json: settings_json } - end - else - render(action: :show) # Expect #show to display errors etc - end - end - - private - - def get_settings - @settings = current_user.settings(:plan_list) - # :name column should always be present (displayed as a disabled checkbox) - # so it's not necessary to include it in the list here - @all_columns -= ['name'] - end - - def settings_json - @settings_json ||= { selected_columns: @settings.columns, all_columns: @all_columns }.to_json - end - end -end diff --git a/app/controllers/suggested_answers_controller.rb b/app/controllers/suggested_answers_controller.rb index cfe3da0..e15d0c0 100644 --- a/app/controllers/suggested_answers_controller.rb +++ b/app/controllers/suggested_answers_controller.rb @@ -7,6 +7,10 @@ @suggested_answer = SuggestedAnswer.new(params[:suggested_answer]) authorize @suggested_answer if @suggested_answer.save + # Set the template's dirty flag to true + @suggested_answer.question.section.phase.template.dirty = true + @suggested_answer.question.section.phase.template.save + redirect_to admin_show_phase_path(id: @suggested_answer.question.section.phase_id, section_id: @suggested_answer.question.section_id, question_id: @suggested_answer.question.id, edit: 'true'), notice: _('Information was successfully created.') else @phase = @suggested_answer.question.section.phase @@ -29,6 +33,10 @@ @section = @question.section @phase = @section.phase if @suggested_answer.update_attributes(params[:suggested_answer]) + # Set the template's dirty flag to true + @phase.template.dirty = true + @phase.template.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.') else flash[:notice] = failed_update_error(@suggested_answer, _('suggested answer')) @@ -44,6 +52,10 @@ @section = @question.section @phase = @section.phase if @suggested_answer.destroy + # Set the template's dirty flag to true + @phase.template.dirty = true + @phase.template.save + redirect_to admin_show_phase_path(id: @phase.id, section_id: @section.id, edit: 'true'), notice: _('Information was successfully deleted.') else redirect_to admin_show_phase_path(id: @phase.id, section_id: @section.id, edit: 'true'), notice: flash[:notice] = failed_destroy_error(@suggested_answer, _('suggested answer')) diff --git a/app/controllers/templates_controller.rb b/app/controllers/templates_controller.rb index 965aaeb..b0eeb11 100644 --- a/app/controllers/templates_controller.rb +++ b/app/controllers/templates_controller.rb @@ -6,208 +6,204 @@ respond_to :html after_action :verify_authorized - # GET /dmptemplates + # GET /org/admin/templates/:id/admin_index + # ----------------------------------------------------- def admin_index authorize Template - # institutional templates - all_versions_own_templates = Template.where(org_id: current_user.org_id, customization_of: nil).order(version: :desc) - current_templates = {} - # take most recent version of each template - all_versions_own_templates.each do |temp| - if current_templates[temp.dmptemplate_id].nil? - current_templates[temp.dmptemplate_id] = temp - end - end - @templates_own = current_templates.values - @other_published_version = {} - current_templates.keys.each do |dmptemplate_id| - @other_published_version[dmptemplate_id] = Template.where(org_id: current_user.org_id, dmptemplate_id: dmptemplate_id, published: true).present? - end - - # funders templates - funders_templates = {} - Org.includes(:templates).funder.each do |org| - org.templates.where(customization_of: nil, published: true).order(version: :desc).each do |temp| - if funders_templates[temp.dmptemplate_id].nil? - funders_templates[temp.dmptemplate_id] = temp + + # Collect all of the published funder templates + @funder_templates = [] + Org.funders.each do |org| + Template.dmptemplate_ids.each do |id| + template = Template.live(id) + # Its possible for the template to NOT have a published version + # so only add it if its not nil + unless template.nil? + @funder_templates << {current: template, live: template} end end end - - @templates_funders = funders_templates.values - # are any funder templates customized - @templates_customizations = {} - Template.where(org_id: current_user.org_id, customization_of: funders_templates.keys).order(version: :desc).each do |temp| - if @templates_customizations[temp.customization_of].nil? - @templates_customizations[temp.customization_of] = {} - @templates_customizations[temp.customization_of][:temp] = temp - @templates_customizations[temp.customization_of][:published] = temp.published - else - @templates_customizations[temp.customization_of][:published] = @templates_customizations[temp.customization_of][:published] || temp.published + + # Collect all of the organisations templates + @org_templates = [] + Template.dmptemplate_ids.each do |id| + template = Template.current(id) + live = Template.live(id) + + # Its possible for the template to NOT have a published version + # so only add it if its not nil + unless template.nil? + if template.customization_of.nil? + @org_templates << {current: template, live: live} + + # Check to see if this is a customization of a funder template + # If so replace the funder's copy + else + @funder_templates.delete_if{|t| + t[:current].dmptemplate_id == template.customization_of + } + @funder_templates << {current: template, live: live} + end end end + + @funder_templates = @funder_templates.sort{|x,y| + x[:current].title <=> y[:current].title + } + @org_templates = @org_templates.sort{|x,y| + x[:current].title <=> y[:current].title + } + end + + # PUT /org/admin/templates/:id/admin_customize + # ----------------------------------------------------- + def admin_customize + @template = Template.find(params[:id]) + authorize @template + + customisation = Template.deep_copy(@template) + customisation.org = current_user.org + customisation.version = 0 + customisation.customization_of = @template.dmptemplate_id + customisation.save + + customisation.phases.includes(:sections, :questions).each do |phase| + phase.modifiable = false + phase.save! + phase.sections.each do |section| + section.modifiable = false + section.save! + section.questions.each do |question| + question.modifiable = false + question.save! + end + end + end + + redirect_to admin_template_template_path(customisation) + end + + # PUT /org/admin/templates/:id/admin_publish + # ----------------------------------------------------- + def admin_publish + @template = Template.find(params[:id]) + authorize @template + + current = Template.current(@template.dmptemplate_id) + + # Only allow the current version to be updated + if current != @template + redirect_to admin_template_template_path(@template), notice: _('You can not publish a historical version of this template.') + + else + # Unpublish the older published version if there is one + live = Template.live(@template.dmptemplate_id) + if !live.nil? and self != live + live.published = false + live.save! + end + # Set the dirty flag to false + @template.dirty = false + @template.published = true + @template.save + + # Create a new version + new_version = Template.deep_copy(@template) + new_version.version = (@template.version + 1) + new_version.published = false + new_version.save + + flash[:notice] = _('Your template has been published and is now available to users.') + + redirect_to admin_index_template_path(current_user.org) + end end + # PUT /org/admin/templates/:id/admin_unpublish + # ----------------------------------------------------- + def admin_unpublish + template = Template.find(params[:id]) + authorize template - # GET /dmptemplates/1 + # Unpublish the live version + @template = Template.live(template.dmptemplate_id) + + if @template.nil? + flash[:notice] = _('That template is not currently published.') + else + @template.published = false + @template.save + flash[:notice] = _('Your template is no longer published. Users will not be able to create new DMPs for this template until you re-publish it') + end + + redirect_to admin_index_template_path(current_user.org) + end + + # GET /org/admin/templates/:id/admin_template + # ----------------------------------------------------- def admin_template @template = Template.includes(:org, phases: [sections: [questions: [:question_options, :question_format, :suggested_answers]]]).find(params[:id]) - # check to see if this is a funder template needing customized - authorize @template - if @template.org_id != current_user.org_id - # definitely need to deep_copy the given template - new_customization = Template.deep_copy(@template) - new_customization.org_id = current_user.org_id - new_customization.published = false - new_customization.customization_of = @template.dmptemplate_id - # need to mark all Phases, questions, sections as not-modifiable - new_customization.phases.includes(sections: :questions).each do |phase| - phase.modifiable = false - phase.save! - phase.sections.each do |section| - section.modifiable = false - section.save! - section.questions.each do |question| - question.modifiable = false - question.save! - end - end - end - customizations = Template.includes(:org, phases: [sections: [questions: :suggested_answers ]]).where(org_id: current_user.org_id, customization_of: @template.dmptemplate_id).order(version: :desc) - if customizations.present? - # existing customization to port over - max_version = customizations.first - new_customization.dmptemplate_id = max_version.dmptemplate_id - new_customization.version = max_version.version + 1 - # here we rip the customizations out of the old template - # First, we find any customized phases or sections - max_version.phases.each do |phase| - # check if the phase was added as a customization - if phase.modifiable - # deep copy the phase and add it to the template - phase_copy = Phase.deep_copy(phase) - phase_copy.number = new_customization.phases.length + 1 - phase_copy.template_id = new_customization.id - phase_copy.save! - else - # iterate over the sections to see if any of them are customizations - phase.sections.each do |section| - if section.modifiable - # this is a custom section - section_copy = Section.deep_copy(section) - customization_phase = new_customization.phases.includes(:sections).where(number: phase.number).first - section_copy.phase_id = customization_phase.id - # custom sections get added to the end - section_copy.number = customization_phase.sections.length + 1 - # section from phase with corresponding number in the main_template - section_copy.save! - else - # not a customized section, iterate over questions - customization_phase = new_customization.phases.includes(sections: [questions: :suggested_answers]).where(number: phase.number).first - customization_section = customization_phase.sections.where(number: section.number).first - section.questions.each do |question| - # find corresponding question in new template - customization_question = customization_section.questions.where(number: question.number).first - # apply suggested_answers - question.suggested_answers.each do |suggested_answer| - suggested_answer_copy = SuggestedAnswer.deep_copy(suggested_answer) - suggested_answer_copy.org_id = current_user.org_id - suggested_answer_copy.question_id = customization_question.id - suggested_answer_copy.save! - end - # guidance attached to a question is also a form of customization - # It will soon become an annotation of the question, and be combined with - # suggested answers - customization_question.guidance = customization_question.guidance + question.guidance - customization_question.save! - end - end - end - end - end - else - # first time customization - new_customization.version = 0 - new_customization.dmptemplate_id = loop do - random = rand 2147483647 # max int field in psql - break random unless Template.exists?(dmptemplate_id: random) - end - end - new_customization.save! - @template = new_customization + + @current = Template.current(@template.dmptemplate_id) + + unless @template == @current + flash[:notice] = _('You are viewing a historical version of this template. You will not be able to make changes.') end - # needed for some post-migration edge cases - # some customized templates which were edited - if @template.published - new_version = Template.deep_copy(@template) - new_version.version = @template.version + 1 - new_version.published = false - new_version.save! - @template = new_version - end - + # once the correct template has been generated, we convert it to hash @hash = @template.to_hash end - # PUT /dmptemplates/1 + # PUT /org/admin/templates/:id/admin_update + # ----------------------------------------------------- def admin_update @template = Template.find(params[:id]) authorize @template - if @template.published? - # published templates cannot be edited - redirect_to admin_template_template_path(@template), notice: _('Published templates cannot be edited.') and return - end - @template.description = params["template-desc"] - if @template.update_attributes(params[:template]) - if @template.published? - # unpublish older versions - Template.where("dmptemplate_id = ? AND published = ? AND version < ?", - @template.dmptemplate_id, true, @template.version).each do |t| - t.published = false - t.save - end - - # create a new template version if this template became published - new_version = Template.deep_copy(@template) - new_version.version = @template.version + 1 - new_version.published = false - new_version.save! - end - redirect_to admin_template_template_path(), notice: _('Information was successfully updated.') + + current = Template.current(@template.dmptemplate_id) + + # Only allow the current version to be updated + if current != @template + redirect_to admin_template_template_path(@template), notice: _('You can not edit a historical version of this template.') + else + if @template.description != params["template-desc"] || + @template.title != params[:template][:title] + @template.dirty = true + end + + @template.description = params["template-desc"] + if @template.update_attributes(params[:template]) + flash[:notice] = _('Information was successfully updated.') + + else + flash[:notice] = failed_update_error(@template, _('template')) + end + @hash = @template.to_hash - flash[:notice] = failed_update_error(@template, _('template')) render 'admin_template' - end + end end - # GET /dmptemplates/new + # GET /org/admin/templates/:id/admin_new + # ----------------------------------------------------- def admin_new authorize Template end - # POST /dmptemplates - # creates a new template with version 0 and new dmptemplate_id + # POST /org/admin/templates/:id/admin_create + # ----------------------------------------------------- def admin_create + # creates a new template with version 0 and new dmptemplate_id @template = Template.new(params[:template]) authorize @template @template.org_id = current_user.org.id @template.description = params['template-desc'] - @template.published = false - @template.version = 0 - @template.visibility = 0 - - # Generate a unique identifier for the dmptemplate_id - @template.dmptemplate_id = loop do - random = rand 2147483647 - break random unless Template.exists?(dmptemplate_id: random) - end if @template.save redirect_to admin_template_template_path(@template), notice: _('Information was successfully created.') @@ -219,24 +215,36 @@ end - # DELETE /dmptemplates/1 + # DELETE /org/admin/templates/:id/admin_destroy + # ----------------------------------------------------- def admin_destroy @template = Template.find(params[:id]) authorize @template - if @template.destroy - redirect_to admin_index_template_path + + current = Template.current(@template.dmptemplate_id) + + # Only allow the current version to be destroyed + if current == @template + if @template.destroy + redirect_to admin_index_template_path + else + @hash = @template.to_hash + flash[:notice] = failed_destroy_error(@template, _('template')) + render admin_template_template_path(@template) + end else - @hash = @template.to_hash - flash[:notice] = failed_destroy_error(@template, _('template')) - render admin_template_template_path(@template) + flash[:notice] = _('You cannot delete historical versions of this template.') + redirect_to admin_index_template_path end end - # GET /templates/1 + # GET /org/admin/templates/:id/admin_template_history + # ----------------------------------------------------- def admin_template_history @template = Template.find(params[:id]) authorize @template @templates = Template.where(dmptemplate_id: @template.dmptemplate_id).order(:version) + @current = Template.current(@template.dmptemplate_id) end end \ No newline at end of file diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 90c6278..44efc03 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -1,12 +1,20 @@ class UserMailer < ActionMailer::Base default from: Rails.configuration.branding[:organisation][:email] + def welcome_notification(user) + @user = user + FastGettext.with_locale FastGettext.default_locale do + mail(to: @user.email, + subject: "#{_('Welcome to')} #{Rails.configuration.branding[:application][:name]}") + end + end + def sharing_notification(role, user) @role = role @user = user FastGettext.with_locale FastGettext.default_locale do mail(to: @role.user.email, - subject: _("You have been given access to a Data Management Plan")) + subject: "#{_('A Data Management Plan in ')} #{Rails.configuration.branding[:application][:name]} #{_(' has been shared with you')}") end end @@ -14,7 +22,7 @@ @role = role FastGettext.with_locale FastGettext.default_locale do mail(to: @role.user.email, - subject: _("DMP permissions changed")) + subject: "#{_('Changed permissions on a DMP in')} #{Rails.configuration.branding[:application][:name]}") end end @@ -23,7 +31,7 @@ @plan = plan FastGettext.with_locale FastGettext.default_locale do mail(to: @user.email, - subject: _("DMP access removed")) + subject: "#{_('Permissions removed on a DMP in')} #{Rails.configuration.branding[:application][:name]}") end end @@ -31,7 +39,7 @@ @user = user FastGettext.with_locale FastGettext.default_locale do mail(to: @user.email, - subject: _('API Permission Granted')) + subject: "#{_('API rights in')} #{Rails.configuration.branding[:application][:name]}") end end end \ No newline at end of file diff --git a/app/models/phase.rb b/app/models/phase.rb index d3e813a..1417661 100644 --- a/app/models/phase.rb +++ b/app/models/phase.rb @@ -5,7 +5,6 @@ # [+Copyright:+] Digital Curation Centre and University of California Curation Center class Phase < ActiveRecord::Base # extend FriendlyId - ## # Associations belongs_to :template @@ -25,11 +24,7 @@ validates :title, :number, :template, presence: {message: _("can't be blank")} - - - - - + # EVALUATE CLASS AND INSTANCE METHODS BELOW # # What do they do? do they do it efficiently, and do we need them? @@ -104,4 +99,5 @@ end return phase_copy end + end diff --git a/app/models/question.rb b/app/models/question.rb index eac588d..336cae9 100644 --- a/app/models/question.rb +++ b/app/models/question.rb @@ -1,5 +1,4 @@ class Question < ActiveRecord::Base - ## # Associations has_many :answers, :dependent => :destroy @@ -29,7 +28,6 @@ validates :text, :section, :number, presence: {message: _("can't be blank")} - # EVALUATE CLASS AND INSTANCE METHODS BELOW # # What do they do? do they do it efficiently, and do we need them? diff --git a/app/models/section.rb b/app/models/section.rb index 2a38972..abf1327 100644 --- a/app/models/section.rb +++ b/app/models/section.rb @@ -1,5 +1,4 @@ class Section < ActiveRecord::Base - ## # Associations belongs_to :phase @@ -47,5 +46,4 @@ end return section_copy end - end diff --git a/app/models/settings/plan_list.rb b/app/models/settings/plan_list.rb deleted file mode 100644 index 01d5c88..0000000 --- a/app/models/settings/plan_list.rb +++ /dev/null @@ -1,21 +0,0 @@ -module Settings - class PlanList < RailsSettings::SettingObject - - #attr_accessible :var, :target, :target_type, :target_id - - # TODO: can these be taken from somewhere else rather than hard-coded here? - DEFAULT_COLUMNS = ['name', 'owner', 'shared', 'last_edited'] - ALL_COLUMNS = DEFAULT_COLUMNS + ['template_owner', 'identifier', 'grant_number', 'visibility', - 'principal_investigator', 'data_contact', 'description'] - - validate do - cols = value["columns"] - - if cols.present? # columns can be empty, in which case they revert to defaults - errors.add(:columns, _("'name' must be included in column list.")) unless cols.member?("name") - errors.add(:columns, _('Duplicate column name. Please only include each column once.')) unless cols.keys.uniq == cols.keys - errors.add(:columns, _('Unknown column name.')) unless (cols.keys.uniq & ALL_COLUMNS) == cols.keys.uniq - end - end - end -end diff --git a/app/models/template.rb b/app/models/template.rb index 598f832..63b4b3e 100644 --- a/app/models/template.rb +++ b/app/models/template.rb @@ -1,6 +1,8 @@ class Template < ActiveRecord::Base include GlobalHelpers - + + before_validation :set_creation_defaults + ## # Associations belongs_to :org @@ -26,18 +28,20 @@ validates :org, :title, :version, presence: {message: _("can't be blank")} - # Helper scopes to get the latest version and the latest published version - scope :current, ->(dmptemplate_id) { where(dmptemplate_id: dmptemplate_id).order(version: :desc).first } - scope :published, ->(dmptemplate_id) { where(dmptemplate_id: dmptemplate_id, published: true).order(version: :desc).first } + # Retrieves the list of all dmptemplate_ids (template versioning families) for the specified Org + def self.dmptemplate_ids + Template.all.distinct.pluck(:dmptemplate_id) + end - # Helper scope to get the dmptemplate_ids for the specified org - scope :family_ids, ->(org_id) { where(org_id: org_id).pluck(:dmptemplate_id).distinct } - - - # EVALUATE CLASS AND INSTANCE METHODS BELOW - # - # What do they do? do they do it efficiently, and do we need them? - + # Retrieves the most recent version of the template for the specified Org and dmptemplate_id + def self.current(dmptemplate_id) + Template.where(dmptemplate_id: dmptemplate_id).order(version: :desc).first + end + + # Retrieves the current published version of the template for the specified Org and dmptemplate_id + def self.live(dmptemplate_id) + Template.where(dmptemplate_id: dmptemplate_id, published: true).first + end ## # deep copy the given template and all of it's associations @@ -55,6 +59,12 @@ return template_copy end + + # EVALUATE CLASS AND INSTANCE METHODS BELOW + # + # What do they do? do they do it efficiently, and do we need them? + + ## # convert the given template to a hash and return with all it's associations # to use, please pre-fetch org, phases, section, questions, suggested_answers, @@ -111,4 +121,25 @@ return !modifiable end + # -------------------------------------------------------- + private + # Initialize the published and dirty flags for new templates + def set_creation_defaults + # Only run this before_validation because rails fires this before save/create + if self.id.nil? + self.published = false + self.dirty = false + self.visibility = 1 + self.version = 0 if self.version.nil? + + # Generate a unique identifier for the dmptemplate_id if necessary + if self.dmptemplate_id.nil? + self.dmptemplate_id = loop do + random = rand 2147483647 + break random unless Template.exists?(dmptemplate_id: random) + end + end + end + end + end diff --git a/app/models/user.rb b/app/models/user.rb index 4cfa675..352b564 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -7,7 +7,7 @@ # :token_authenticatable, :confirmable, # :lockable, :timeoutable and :omniauthable devise :invitable, :database_authenticatable, :registerable, :recoverable, - :rememberable, :trackable, :validatable, :confirmable, :omniauthable, + :rememberable, :trackable, :validatable, :omniauthable, :omniauth_providers => [:shibboleth, :orcid] ## @@ -52,14 +52,6 @@ validates :email, email: true, allow_nil: true, uniqueness: {message: _("must be unique")} ## - # Settings - # FIXME: The duplication in the block is to set defaults. It might be better if - # they could be set in Settings::PlanList itself, if possible. - has_settings :plan_list, class_name: 'Settings::PlanList' do |s| - s.key :plan_list, defaults: { columns: Settings::PlanList::DEFAULT_COLUMNS } - end - - ## # Scopes default_scope { includes(:org, :perms, :plans) } diff --git a/app/policies/template_policy.rb b/app/policies/template_policy.rb index 3c9fb80..eeda053 100644 --- a/app/policies/template_policy.rb +++ b/app/policies/template_policy.rb @@ -20,6 +20,18 @@ def admin_template? user.can_modify_templates? && (template.org_id == user.org_id) end + + def admin_customize? + user.can_modify_templates? + end + + def admin_publish? + user.can_modify_templates? && (template.org_id == user.org_id) + end + + def admin_unpublish? + user.can_modify_templates? && (template.org_id == user.org_id) + end def admin_update? user.can_modify_templates? && (template.org_id == user.org_id) diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb index 21ba9ff..55858c9 100644 --- a/app/views/devise/mailer/reset_password_instructions.html.erb +++ b/app/views/devise/mailer/reset_password_instructions.html.erb @@ -1,10 +1,13 @@ <% FastGettext.with_locale FastGettext.default_locale do %> -

<%= _("Hello") %> <%= @resource.email %>!

+

<%= _("Hello ") %><%= @resource.email %>

-

<%= _("Someone has requested a link to change your") %> <%= link_to Rails.configuration.branding[:application][:name], root_url %> <%= _("password. You can do this through the link below.") %>

+

<%= _("Someone has requested a link to change your ") %><%= Rails.configuration.branding[:application][:name] %><%= _(" password. You can do this through the link below.") %>

-

<%= link_to _('Change my password'), edit_password_url(@resource, :reset_password_token => @token) %>

+

<%= link_to _('Change my password'), edit_password_url(@resource, :reset_password_token => @token) %>

-

<%= _("If you didn't request this, please ignore this email.") %>

-

<%= _("Your password won't change until you access the link above and create a new one.") %>

+

<%= _("If you didn't request this, please ignore this email.") %>

+ +

+ <%= _("Many thanks,") %>
<%= _('The ') %><%= Rails.configuration.branding[:application][:name] %><%= _(' team') %> +

<% end %> \ No newline at end of file diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb index 4ed662d..57bfe0b 100644 --- a/app/views/layouts/_navigation.html.erb +++ b/app/views/layouts/_navigation.html.erb @@ -48,10 +48,6 @@
  • > <%= link_to _('Help'), help_path %>
    • - -
  • > - <%= link_to _('Public DMPs'), public_plans_path %> -
    • <% if MANY_LANGUAGES %>
  • diff --git a/app/views/phases/_answer.html.erb b/app/views/phases/_answer.html.erb index 5793739..24cf732 100644 --- a/app/views/phases/_answer.html.erb +++ b/app/views/phases/_answer.html.erb @@ -14,7 +14,7 @@ right now you'd need to parameterise it with the form parameter which doesn't exist if you are coming from /answer/update --> -

    <%= _("While you were editing #{answer.user.name} saved the following answer:") %>

    +

    <%= _("While you were editing ") + answer.user.name + _(" saved the following answer:") %>

    <%= semantic_form_for answer, :url => {:controller => :answers, :action => :update }, :remote => true do |af| %> <%= af.inputs do %> @@ -64,14 +64,14 @@ <% end %> <% if qformat.textfield? %> - <%= text_field_tag("answer-text-Ans#{question.id}".to_sym, strip_tags(answer.text), class: "question_text_field") %> + <%= text_field_tag("answer-text-Ans#{question.id}".to_sym, strip_tags(answer.text), class: "question_text_field", disabled: true) %> <% elsif qformat.textarea? %> - <%= text_area_tag("answer-text-Ans#{question["id"]}".to_sym, strip_tags(answer.text), class: "tinymce answer-notice") %> + <%= text_area_tag("answer-text-Ans#{question["id"]}".to_sym, strip_tags(answer.text), class: "tinymce answer-notice", disabled: true) %> <% end %> <% end %> <% end %> -

    <%= _('Combine their changes with your answer below and then save the answer again.') %>

    +

    <%= _('Combine their changes with your answer below and then save the answer again.') %>
    <%= _('The edits in the box below will overwrite the existing answer from ') + answer.user.name + _(' once you click save!')%>

    diff --git a/app/views/plans/_plan_list_head.html.erb b/app/views/plans/_plan_list_head.html.erb index e2d3f9b..6b05f86 100644 --- a/app/views/plans/_plan_list_head.html.erb +++ b/app/views/plans/_plan_list_head.html.erb @@ -1,5 +1,5 @@ - <% @selected_columns.each do |column| %> + <% ['name', 'owner', 'shared', 'last_edited'].each do |column| %> <%= plan_list_column_heading(column) %> <% end %> <%= _('Select an action')%> diff --git a/app/views/plans/_plan_list_item.html.erb b/app/views/plans/_plan_list_item.html.erb index 294275e..ad1dff2 100644 --- a/app/views/plans/_plan_list_item.html.erb +++ b/app/views/plans/_plan_list_item.html.erb @@ -1,5 +1,5 @@ - <% @selected_columns.each do |column| %> + <% ['name', 'owner', 'shared', 'last_edited'].each do |column| %> <%= plan_list_column_body(column, plan) %> <% end %> diff --git a/app/views/plans/_toolbar.html.erb b/app/views/plans/_toolbar.html.erb index 9208396..f324927 100644 --- a/app/views/plans/_toolbar.html.erb +++ b/app/views/plans/_toolbar.html.erb @@ -4,9 +4,5 @@ <%= _('Cancel') -%> - - - - diff --git a/app/views/questions/_show_question.html.erb b/app/views/questions/_show_question.html.erb index 687600e..e690b14 100644 --- a/app/views/questions/_show_question.html.erb +++ b/app/views/questions/_show_question.html.erb @@ -120,14 +120,13 @@
    - <% if (@edit && question.section.modifiable) || question.section.phase.template.customization_of.present? %> + <% if (@edit && question.modifiable) %>
    <%= hidden_field_tag :question_id, question.id, class: "question_id" %> <%= link_to _('Edit question'), '# ', class: "btn btn-primary edit_question_button"%> - <% if !question.section.published? %> - <%= link_to _('Delete question'), admin_destroy_question_path(question_id: question.id), + + <%= link_to _('Delete question'), admin_destroy_question_path(question_id: question.id), confirm: _("You are about to delete '%{question_text}'. Are you sure?") % { :question_text => question.text }, method: :delete, class: "btn btn-primary"%> - <% end %>
    <% elsif !@edit && question.modifiable %> <% suggested_answer = question.get_suggested_answer(current_user.org_id) %> diff --git a/app/views/sections/_show_section.html.erb b/app/views/sections/_show_section.html.erb index 0573cb1..8659bc3 100644 --- a/app/views/sections/_show_section.html.erb +++ b/app/views/sections/_show_section.html.erb @@ -30,15 +30,15 @@
    "> + + <% if question.modifiable %> + <%= render partial: 'questions/edit_question', locals: {question: question} %> + <% else %> <%= render partial: 'questions/show_question', locals: {question: question} %> + <% end %>
    - <% if section.phase.template.customization_of.present? %> - - <% end %> +
    <% if last_question_id == question.id %> diff --git a/app/views/settings/plans/show.html.erb b/app/views/settings/plans/show.html.erb deleted file mode 100644 index 69a9226..0000000 --- a/app/views/settings/plans/show.html.erb +++ /dev/null @@ -1,43 +0,0 @@ -

    <%= _('Settings - My plans') -%>

    -

    <%= _("The table below lists the available columns that can be shown on the 'My plans' list. Choose which you would like to appear.") -%>

    - -<% @settings.errors.full_messages.each do |error| %> -
    <%= error %>
    -<% end %> - -<%= form_for(@settings, url: settings_plans_path, method: :put, as: :columns) do |f| %> - <%= f.hidden_field(:name, value: true) %> - - - - - - <% @all_columns.each do |column| %> - - <% end %> - - - - - - - <% - @all_columns.each do |column| - checked = @selected_columns.member?(column) - %> - - <% end %> - - - - - - - - - -
    - <%= label_tag("columns[name]", _('Name')) -%><%= label_tag("columns[#{column}]", t("helpers.project.columns.#{column}")) -%><%= label_tag("columns[select]", _('Select an action')) -%>
    - - <%= check_box_tag("columns[name]", true, true, disabled: true) -%><%= check_box_tag("columns[#{column}]", true, checked) -%><%= check_box_tag("columns[select]", true, true, disabled: true) -%>
    <%= submit_tag(_('Save'), class: "btn btn-primary") -%><%= link_to(_('Cancel'), projects_path, class: "btn btn-primary") -%>
    -<% end %> diff --git a/app/views/templates/_edit_template.html.erb b/app/views/templates/_edit_template.html.erb index 8077da0..b1656c0 100644 --- a/app/views/templates/_edit_template.html.erb +++ b/app/views/templates/_edit_template.html.erb @@ -19,9 +19,17 @@ - <%= _('Published') %> + <%= _('Status') %> - <%= f.check_box :published, as: :check_boxes %> + <% if hash[:live].nil? %> + <%= _('Unpublished') %> + + <% elsif hash[:current].dirty? %> + <%= _('You have un-published changes') %> + + <% else %> + <%= _('Published') %> + <% end %> diff --git a/app/views/templates/_show_phases_sections.html.erb b/app/views/templates/_show_phases_sections.html.erb index 784f16e..0c15d12 100644 --- a/app/views/templates/_show_phases_sections.html.erb +++ b/app/views/templates/_show_phases_sections.html.erb @@ -14,7 +14,7 @@ <% if phase_hash[:sections].length > 0 %> <%= link_to _('Preview'), admin_preview_phase_path(id: phase.id), class: 'btn btn-primary'%> <% end %> - <% if !template.published? %> + <% if template == current && phase.modifiable %> <%= link_to _('Delete'), admin_destroy_phase_path(phase_id: phase.id), confirm: _("You are about to delete '%{phase_title}'. This will affect versions, sections and questions linked to this phase. Are you sure?") % { :phase_title => phase.title }, method: :delete, class: "btn btn-primary"%> <% end %> diff --git a/app/views/templates/_show_template.html.erb b/app/views/templates/_show_template.html.erb index 6e5b583..423dc5f 100644 --- a/app/views/templates/_show_template.html.erb +++ b/app/views/templates/_show_template.html.erb @@ -1,6 +1,6 @@ -<% if template.org.not_funder? || current_user.org.funder? then %> +<% if template == current then %>

    <%= link_to _('Edit template details'), '# ', class: "btn btn-primary", id: "edit_template_button"%> @@ -24,9 +24,17 @@ - <%= _('Published') %> + <%= _('Status') %> - <%= template.published %> + <% if hash[:live].nil? %> + <%= _('Unpublished') %> + + <% elsif hash[:current].dirty? %> + <%= _('You have un-published changes') %> + + <% else %> + <%= _('Published') %> + <% end %> diff --git a/app/views/templates/admin_index.html.erb b/app/views/templates/admin_index.html.erb index 67e75f6..4c403ad 100644 --- a/app/views/templates/admin_index.html.erb +++ b/app/views/templates/admin_index.html.erb @@ -22,55 +22,54 @@
    -<% if @templates_own.length > 0 then %> +<% if @org_templates.length > 0 then %> - + - <% @templates_own.each do |org_template| %> + <% @org_templates.each do |hash| %> - + + + <% end %> @@ -89,61 +88,75 @@ - <% if @templates_funders.length > 0 then %> + <% if @funder_templates.length > 0 then %>
    <%= _('Title') %> <%= _('Description') %><%= _('Published') %><%= _('Status') %> <%= _('Last updated') %> <%= _('Actions') %>
    - <%= org_template.title%> + <%= hash[:current].title %> - <%= raw org_template.description.truncate(90, omission: _('... (continued)')) %> + <%= raw hash[:current].description.truncate(90, omission: _('... (continued)')) unless hash[:current].description.nil? %> - <% #Yes if published version exists, Yes[Unpublished changes] if newer version modified, No otherwise%> - <% if org_template.published %> - <%= _('Yes') %> - <% elsif org_template.version > 0 && @other_published_version[org_template.dmptemplate_id] %> - <% #there is a published version, but this version is not (data access in view TODO: clean) %> - <% if org_template.created_at < org_template.updated_at %> - <%= _('Yes') + " " + _('[Unpublished Changes]') %> - <% else %> - <%= _('Yes') %> - <% end %> - <% else %> - <%= _('No') %> + <% if hash[:live].nil? %> + <%= _('Unpublished') %> + + <% elsif hash[:current].dirty? %> + <%= _('Unpublished changes') %> + + <% else %> + <%= _('Published') %> <% end %> - - <% last_temp_updated = org_template.updated_at %> - <% org_template.phases.each do |phase|%> - <% if org_template.updated_at.to_date < phase.updated_at.to_date then %> - <% last_temp_updated = phase.updated_at %> - <% end %> - <% end %> - <%= l last_temp_updated.to_date, formats: :short %> - + <% last_temp_updated = hash[:current].updated_at %> + <%= l last_temp_updated.to_date, formats: :short %> + - <%= link_to _('Edit'), admin_template_template_path(id: org_template.id, edit: "true"), class: "dmp_table_link" %> - <%= link_to _('View'), admin_template_template_path(id: org_template), class: "dmp_table_link"%> - <%= link_to _('History'), admin_template_history_template_path(id: org_template.id), class: "dmp_table_link" %> + <%= link_to _('Edit'), admin_template_template_path(id: hash[:current].id, edit: "true"), class: "dmp_table_link" %> + <%= link_to _('History'), admin_template_history_template_path(id: hash[:current].id), class: "dmp_table_link" %> + + <% if hash[:live].nil? %> +
    <%= link_to _('Publish'), admin_publish_template_path(hash[:current]), method: :put, class: "dmp_table_link" %> + <% elsif hash[:current].dirty? %> +
    <%= link_to _('Publish changes'), admin_publish_template_path(hash[:current]), method: :put, class: "dmp_table_link" %> + <% else %> +
    <%= link_to _('Unpublish'), admin_unpublish_template_path(hash[:current]), method: :put, class: "dmp_table_link" %> + <% end %>
    - + - <% @templates_funders.each do |org_template| %> + <% @funder_templates.each do |hash| %> <% end %> diff --git a/app/views/templates/admin_template.html.erb b/app/views/templates/admin_template.html.erb index d7734f6..afac069 100644 --- a/app/views/templates/admin_template.html.erb +++ b/app/views/templates/admin_template.html.erb @@ -19,14 +19,13 @@
    - <% if @hash[:template][:org].funder? || current_user.org.funder? || - @hash[:template][:org] == current_user.org %> + <% if @template == @current %> <% end %>
    - <%= render partial: "templates/show_template", locals: {template: @template, hash: @hash}%> + <%= render partial: "templates/show_template", locals: {template: @template, current: @current, hash: @hash}%>
    @@ -34,7 +33,7 @@ <% if @hash[:template][:phases].length == 1 %> <% @hash[:template][:phases].each do |phase_no, phase| %> - <%= render partial: 'templates/show_phases_sections', locals: {phase: phase[:data], phase_hash: phase, template: @template} %> + <%= render partial: 'templates/show_phases_sections', locals: {phase: phase[:data], phase_hash: phase, template: @template, current: @current} %> <% end %> <% else %> <% (1..@hash[:template][:phases].length).each do |phase_no| %> @@ -50,7 +49,7 @@
    - <%= render partial: 'templates/show_phases_sections', locals: {phase: phase[:data], phase_hash: phase, template: @template}%> + <%= render partial: 'templates/show_phases_sections', locals: {phase: phase[:data], phase_hash: phase, template: @template, current: @current}%>
    diff --git a/app/views/templates/admin_template_history.html.erb b/app/views/templates/admin_template_history.html.erb index 34bb175..297bf17 100644 --- a/app/views/templates/admin_template_history.html.erb +++ b/app/views/templates/admin_template_history.html.erb @@ -41,7 +41,7 @@ <%= org_template.version %> <%end%> diff --git a/app/views/user_mailer/api_token_granted_notification.html.erb b/app/views/user_mailer/api_token_granted_notification.html.erb index 7b8fda1..652b8e3 100644 --- a/app/views/user_mailer/api_token_granted_notification.html.erb +++ b/app/views/user_mailer/api_token_granted_notification.html.erb @@ -1,7 +1,12 @@ <% FastGettext.with_locale FastGettext.default_locale do %> -

    <% _('Hello ') %><%= @user.name %>

    - -

    - <% _('You have been granted permission by your organisation to use our API. ') %>"<%= link_to _('Your API token and instructions for using the API endpoints can be found here.'), controller: "users", action: "edit" %>". -

    +

    <% _('Hello ') %><%= @user.name %>

    + +

    <%= _('You have been granted permission by your organisation to use our API. Your API token and instructions for using the API endpoints can be found ')%>here. +

    + +

    + <%=_('All the best,')%> +
    + <%= _('The ')%><%= Rails.configuration.branding[:application][:name] %><%=_(' team')%>. +

    <% end %> \ No newline at end of file diff --git a/app/views/user_mailer/permissions_change_notification.html.erb b/app/views/user_mailer/permissions_change_notification.html.erb index e7b1dcb..2577f06 100644 --- a/app/views/user_mailer/permissions_change_notification.html.erb +++ b/app/views/user_mailer/permissions_change_notification.html.erb @@ -1,15 +1,24 @@ <% FastGettext.with_locale FastGettext.default_locale do %> -

    <%= _('Hello ') %> <%= @role.user.name %>

    +

    <%= _('Hello ') %><%= @role.user.name %>

    - <% - access_level = "read-only" - if @role.editor? - access_level = "editor" - end - if @role.administrator? - access_level = "co-owner" - end - %> + <% + access_level = "read-only" + permissions = "This means you can read the plan and leave comments." + if @role.editor? + access_level = "editor" + permissions = "This means you can write and edit the plan in a collaborative manner." + end + if @role.administrator? + access_level = "co-owner" + permissions = "This means you can write and edit the plan in a collaborative manner. You can also grant rights to other collaborators." + end + %> -

    <%= _('Your permissions relating to ') %>"<%= link_to @role.plan.title, url_for(action: 'show', controller: 'plans', id: @role.plan.id, locale: I18n.default_locale) %>"<%= _(' have changed. You now have ') %><%= access_level %><%= _(' access.') %>

    +

    <%= _('Your permissions relating to ') %>"<%= link_to @role.plan.title, url_for(action: 'show', controller: 'plans', id: @role.plan.id, locale: I18n.default_locale) %>"<%= _(' have changed. ') %><%= permissions %>

    + +

    + <%=_('All the best,')%> +
    + <%= _('The ')%><%= Rails.configuration.branding[:application][:name] %><%=_(' team')%>. +

    <% end %> \ No newline at end of file diff --git a/app/views/user_mailer/project_access_removed_notification.html.erb b/app/views/user_mailer/project_access_removed_notification.html.erb index 4656bc5..4c74c21 100644 --- a/app/views/user_mailer/project_access_removed_notification.html.erb +++ b/app/views/user_mailer/project_access_removed_notification.html.erb @@ -1,5 +1,11 @@ <% FastGettext.with_locale FastGettext.default_locale do %> -

    <%= _('Hello ') %> <%= @user.name %>

    +

    <%= _('Hello ') %><%= @user.email %>

    -

    <%= _('Your access to ') %>"<%= @plan.title %>"<%= _(' has been removed.') %>

    +

    <%= _('Your access to ') %>"<%= @plan.title %>"<%= _(' has been removed by ') %><%= @user.email %>.

    + +

    + <%=_('All the best,')%> +
    + <%= _('The ')%><%= Rails.configuration.branding[:application][:name] %><%=_(' team')%>. +

    <% end %> \ No newline at end of file diff --git a/app/views/user_mailer/sharing_notification.html.erb b/app/views/user_mailer/sharing_notification.html.erb index befc872..ff869ec 100644 --- a/app/views/user_mailer/sharing_notification.html.erb +++ b/app/views/user_mailer/sharing_notification.html.erb @@ -1,18 +1,15 @@ <% FastGettext.with_locale FastGettext.default_locale do %> -

    <%= _('Hello ') %> <%= @role.user.name %>

    +

    <%= _('Hello ') %><%= @role.user.name %>

    - <% - access_level = "read-only" - if @role.editor? - access_level = "editor" - elsif @role.administrator? - access_level = "co-owner" - end - %> +

    <%= _('A colleague has invited you to contribute to their Data Management Plan at ') %><%=Rails.configuration.branding[:application][:name]%>

    -

    <%= _('You have been given ') %><%= access_level %><%= _(' access to') %>"<%= link_to @role.plan.title, url_for(action: 'show', controller: 'plans', id: @role.plan.id, locale: FastGettext.default_locale) %>" <%=_(' by ')%><%= @user.name %>.

    +

    <%= link_to _('Click here'), url_for(action: 'show', controller: 'plans', id: @role.plan.id, locale: FastGettext.default_locale) %><%= _(' to accept the invitation, (or copy ') %><%= url_for(action: 'show', controller: 'plans', id: @role.plan.id, locale: FastGettext.default_locale) %><%= _(' into your browser)')%> -

    <%=_('Please follow the link above to login to ')%><%=Rails.configuration.branding[:application][:name]%><%=_(' to view/edit the plan')%>.

    -

    <%=_('Thanks')%>

    -

    <%=Rails.configuration.branding[:application][:name]%> <%=_(' team')%>

    +

    <%= _('If you don\'t want to accept the invitation, please ignore this email.') %>

    + +

    + <%=_('All the best,')%> +
    + <%= _('The ')%><%= Rails.configuration.branding[:application][:name] %><%=_(' team')%>. +

    <% end %> \ No newline at end of file diff --git a/app/views/user_mailer/welcome_notification.html.erb b/app/views/user_mailer/welcome_notification.html.erb new file mode 100644 index 0000000..7bda2d0 --- /dev/null +++ b/app/views/user_mailer/welcome_notification.html.erb @@ -0,0 +1,11 @@ +<% FastGettext.with_locale FastGettext.default_locale do %> +

    <%= _('Welcome to ') %><%= Rails.configuration.branding[:application][:name] %>

    + +

    <%= Rails.configuration.branding[:application][:name] %><%= _(' will help you to develop your Data Management Plan. If you have any queries or feedback as you use the tool, please contact us on ') %><%= Rails.configuration.branding[:application][:email] %>

    + +

    + <%=_('All the best,')%> +
    + <%= _('The ')%><%= Rails.configuration.branding[:application][:name] %><%=_(' team')%>. +

    +<% end %> \ No newline at end of file diff --git a/config/locale/app.pot b/config/locale/app.pot index 6f281bc..617a923 100644 --- a/config/locale/app.pot +++ b/config/locale/app.pot @@ -2939,4 +2939,6 @@ msgid "activerecord.errors.models.user.attributes.email.blank" msgstr "can't be blank" msgid "activerecord.errors.models.user.attributes.password.blank" -msgstr "can't be blank" \ No newline at end of file +msgstr "can't be blank" +msgid "activerecord.errors.models.user.attributes.current_password.invalid" +msgstr "invalid email and/or password" \ No newline at end of file diff --git a/config/locale/de/app.po b/config/locale/de/app.po index a37ae09..80bc22d 100644 --- a/config/locale/de/app.po +++ b/config/locale/de/app.po @@ -2930,4 +2930,6 @@ msgid "activerecord.errors.models.user.attributes.email.blank" msgstr "" msgid "activerecord.errors.models.user.attributes.password.blank" +msgstr "" +msgid "activerecord.errors.models.user.attributes.current_password.invalid" msgstr "" \ No newline at end of file diff --git a/config/locale/en_GB/app.po b/config/locale/en_GB/app.po index d4bf139..aa29112 100644 --- a/config/locale/en_GB/app.po +++ b/config/locale/en_GB/app.po @@ -2930,4 +2930,6 @@ msgid "activerecord.errors.models.user.attributes.email.blank" msgstr "can't be blank" msgid "activerecord.errors.models.user.attributes.password.blank" -msgstr "can't be blank" \ No newline at end of file +msgstr "can't be blank" +msgid "activerecord.errors.models.user.attributes.current_password.invalid" +msgstr "invalid email and/or password" \ No newline at end of file diff --git a/config/locale/en_US/app.po b/config/locale/en_US/app.po index a6660d2..337a55a 100644 --- a/config/locale/en_US/app.po +++ b/config/locale/en_US/app.po @@ -2930,4 +2930,6 @@ msgid "activerecord.errors.models.user.attributes.email.blank" msgstr "can't be blank" msgid "activerecord.errors.models.user.attributes.password.blank" -msgstr "can't be blank" \ No newline at end of file +msgstr "can't be blank" +msgid "activerecord.errors.models.user.attributes.current_password.invalid" +msgstr "invalid email and/or password" \ No newline at end of file diff --git a/config/locale/es/app.po b/config/locale/es/app.po index a8b2cbe..b991156 100644 --- a/config/locale/es/app.po +++ b/config/locale/es/app.po @@ -2834,4 +2834,6 @@ msgid "activerecord.errors.models.user.attributes.email.blank" msgstr "" msgid "activerecord.errors.models.user.attributes.password.blank" +msgstr "" +msgid "activerecord.errors.models.user.attributes.current_password.invalid" msgstr "" \ No newline at end of file diff --git a/config/locale/fr/app.po b/config/locale/fr/app.po index 01dd7a9..2230a65 100644 --- a/config/locale/fr/app.po +++ b/config/locale/fr/app.po @@ -2938,4 +2938,6 @@ msgid "activerecord.errors.models.user.attributes.email.blank" msgstr "" msgid "activerecord.errors.models.user.attributes.password.blank" +msgstr "" +msgid "activerecord.errors.models.user.attributes.current_password.invalid" msgstr "" \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 2f0a5ff..2c00de5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -32,7 +32,6 @@ devise_for :users, controllers: { registrations: "registrations", - confirmations: 'confirmations', passwords: 'passwords', sessions: 'sessions', omniauth_callbacks: 'users/omniauth_callbacks'} do @@ -130,6 +129,9 @@ delete 'admin_destroy' post 'admin_create' put 'admin_update' + put 'admin_customize' + put 'admin_publish' + put 'admin_unpublish' end end diff --git a/db/migrate/20170421170849_add_dirty_to_templates.rb b/db/migrate/20170421170849_add_dirty_to_templates.rb new file mode 100644 index 0000000..e4d89a0 --- /dev/null +++ b/db/migrate/20170421170849_add_dirty_to_templates.rb @@ -0,0 +1,5 @@ +class AddDirtyToTemplates < ActiveRecord::Migration + def change + add_column :templates, :dirty, :boolean, default: false + end +end diff --git a/db/schema.rb b/db/schema.rb index cbe7b61..62d2ca1 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,10 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170412143945) do - - # These are extensions that must be enabled in order to support this database - enable_extension "plpgsql" +ActiveRecord::Schema.define(version: 20170421170849) do create_table "answers", force: :cascade do |t| t.text "text" @@ -23,23 +20,27 @@ t.integer "question_id" t.datetime "created_at" t.datetime "updated_at" - t.integer "lock_version", default: 0 + t.integer "lock_version", default: 0 end + add_index "answers", ["plan_id"], name: "fk_rails_84a6005a3e" + add_index "answers", ["question_id"], name: "fk_rails_3d5ed4418f" + add_index "answers", ["user_id"], name: "fk_rails_584be190c2" + create_table "answers_question_options", id: false, force: :cascade do |t| t.integer "answer_id", null: false t.integer "question_option_id", null: false end - add_index "answers_question_options", ["answer_id", "question_option_id"], name: "answer_question_option_index", using: :btree - add_index "answers_question_options", ["question_option_id", "answer_id"], name: "question_option_answer_index", using: :btree + add_index "answers_question_options", ["answer_id", "question_option_id"], name: "answer_question_option_index" + add_index "answers_question_options", ["question_option_id", "answer_id"], name: "question_option_answer_index" create_table "exported_plans", force: :cascade do |t| t.integer "plan_id" t.integer "user_id" t.string "format" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.integer "phase_id" end @@ -48,8 +49,8 @@ t.string "icon_name" t.integer "icon_size" t.string "icon_location" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "file_uploads", force: :cascade do |t| @@ -60,45 +61,50 @@ t.boolean "published" t.string "location" t.integer "file_type_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "friendly_id_slugs", force: :cascade do |t| - t.string "slug", null: false - t.integer "sluggable_id", null: false - t.string "sluggable_type", limit: 40 + t.string "slug", null: false + t.integer "sluggable_id", null: false + t.string "sluggable_type" t.datetime "created_at" end - add_index "friendly_id_slugs", ["slug", "sluggable_type"], name: "index_friendly_id_slugs_on_slug_and_sluggable_type", unique: true, using: :btree - add_index "friendly_id_slugs", ["sluggable_id"], name: "index_friendly_id_slugs_on_sluggable_id", using: :btree - add_index "friendly_id_slugs", ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type", using: :btree + add_index "friendly_id_slugs", ["slug", "sluggable_type"], name: "index_friendly_id_slugs_on_slug_and_sluggable_type", unique: true + add_index "friendly_id_slugs", ["sluggable_id"], name: "index_friendly_id_slugs_on_sluggable_id" + add_index "friendly_id_slugs", ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type" create_table "guidance_groups", force: :cascade do |t| t.string "name" t.integer "org_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.boolean "optional_subset" t.boolean "published" end + add_index "guidance_groups", ["org_id"], name: "fk_rails_819c1dbbc7" + create_table "guidances", force: :cascade do |t| t.text "text" t.integer "guidance_group_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.integer "question_id" t.boolean "published" end + add_index "guidances", ["guidance_group_id"], name: "fk_rails_20d29da787" + create_table "identifier_schemes", force: :cascade do |t| t.string "name" t.string "description" t.boolean "active" t.datetime "created_at" t.datetime "updated_at" + t.boolean "use_for_login", default: false end create_table "languages", force: :cascade do |t| @@ -118,6 +124,9 @@ t.datetime "updated_at" end + add_index "notes", ["answer_id"], name: "fk_rails_907f8d48bf" + add_index "notes", ["user_id"], name: "fk_rails_7f2323ad43" + create_table "org_token_permissions", force: :cascade do |t| t.integer "org_id" t.integer "token_permission_type_id" @@ -125,13 +134,16 @@ t.datetime "updated_at" end + add_index "org_token_permissions", ["org_id"], name: "fk_rails_e1db1b22c5" + add_index "org_token_permissions", ["token_permission_type_id"], name: "fk_rails_2aa265f538" + create_table "orgs", force: :cascade do |t| t.string "name" t.string "abbreviation" t.string "target_url" t.string "wayfless_entity" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.integer "parent_id" t.boolean "is_other" t.string "sort_name" @@ -145,14 +157,17 @@ t.integer "org_type", default: 0, null: false end + add_index "orgs", ["language_id"], name: "fk_rails_5640112cab" + add_index "orgs", ["region_id"], name: "fk_rails_5a6adf6bab" + create_table "perms", force: :cascade do |t| t.string "name" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end - add_index "perms", ["name"], name: "index_perms_on_name", using: :btree - add_index "perms", ["name"], name: "index_roles_on_name_and_resource_type_and_resource_id", using: :btree + add_index "perms", ["name"], name: "index_perms_on_name" + add_index "perms", ["name"], name: "index_roles_on_name_and_resource_type_and_resource_id" create_table "phases", force: :cascade do |t| t.string "title" @@ -165,16 +180,18 @@ t.boolean "modifiable" end + add_index "phases", ["template_id"], name: "fk_rails_0f8036cb2e" + create_table "plan_guidance_groups", force: :cascade do |t| t.integer "plan_id" t.integer "guidance_group_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.boolean "selected" end - add_index "plan_guidance_groups", ["guidance_group_id"], name: "index_plan_guidance_groups_on_guidance_group_id", using: :btree - add_index "plan_guidance_groups", ["plan_id"], name: "index_plan_guidance_groups_on_plan_id", using: :btree + add_index "plan_guidance_groups", ["guidance_group_id"], name: "index_plan_guidance_groups_on_guidance_group_id" + add_index "plan_guidance_groups", ["plan_id"], name: "index_plan_guidance_groups_on_plan_id" create_table "plans", force: :cascade do |t| t.integer "project_id" @@ -193,12 +210,14 @@ t.integer "visibility", default: 0, null: false end + add_index "plans", ["template_id"], name: "fk_rails_3424ca281f" + create_table "question_formats", force: :cascade do |t| t.string "title" t.text "description" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.boolean "option_based", default: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.boolean "option_based", default: false t.integer "formattype", default: 0 end @@ -211,6 +230,8 @@ t.datetime "updated_at" end + add_index "question_options", ["question_id"], name: "fk_rails_b9c5f61cf9" + create_table "questions", force: :cascade do |t| t.text "text" t.text "default_value" @@ -220,17 +241,20 @@ t.datetime "created_at" t.datetime "updated_at" t.integer "question_format_id" - t.boolean "option_comment_display", default: true + t.boolean "option_comment_display", default: true t.boolean "modifiable" end + add_index "questions", ["question_format_id"], name: "fk_rails_4fbc38c8c7" + add_index "questions", ["section_id"], name: "fk_rails_c50eadc3e3" + create_table "questions_themes", id: false, force: :cascade do |t| t.integer "question_id", null: false t.integer "theme_id", null: false end - add_index "questions_themes", ["question_id", "theme_id"], name: "question_theme_index", using: :btree - add_index "questions_themes", ["theme_id", "question_id"], name: "theme_question_index", using: :btree + add_index "questions_themes", ["question_id", "theme_id"], name: "question_theme_index" + add_index "questions_themes", ["theme_id", "question_id"], name: "theme_question_index" create_table "regions", force: :cascade do |t| t.string "abbreviation" @@ -247,6 +271,9 @@ t.integer "access", default: 0, null: false end + add_index "roles", ["plan_id"], name: "fk_rails_a1ce6c2772" + add_index "roles", ["user_id"], name: "fk_rails_ab35d699f0" + create_table "sections", force: :cascade do |t| t.string "title" t.text "description" @@ -258,6 +285,8 @@ t.boolean "modifiable" end + add_index "sections", ["phase_id"], name: "fk_rails_1853581585" + create_table "settings", force: :cascade do |t| t.string "var", null: false t.text "value" @@ -267,12 +296,12 @@ t.datetime "updated_at", null: false end - add_index "settings", ["target_type", "target_id", "var"], name: "index_settings_on_target_type_and_target_id_and_var", unique: true, using: :btree + add_index "settings", ["target_type", "target_id", "var"], name: "index_settings_on_target_type_and_target_id_and_var", unique: true create_table "splash_logs", force: :cascade do |t| t.string "destination" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "suggested_answers", force: :cascade do |t| @@ -284,6 +313,9 @@ t.datetime "updated_at" end + add_index "suggested_answers", ["org_id"], name: "fk_rails_473de65779" + add_index "suggested_answers", ["question_id"], name: "fk_rails_daa60b5b70" + create_table "templates", force: :cascade do |t| t.string "title" t.text "description" @@ -297,13 +329,16 @@ t.integer "visibility" t.integer "customization_of" t.integer "dmptemplate_id" + t.boolean "dirty", default: false end + add_index "templates", ["org_id"], name: "fk_rails_481431e1bd" + create_table "themes", force: :cascade do |t| t.string "title" t.text "description" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.string "locale" end @@ -312,6 +347,9 @@ t.integer "guidance_id" end + add_index "themes_in_guidance", ["guidance_id"], name: "fk_rails_a5ab9402df" + add_index "themes_in_guidance", ["theme_id"], name: "fk_rails_7d708f6f1e" + create_table "token_permission_types", force: :cascade do |t| t.string "token_type" t.text "text_description" @@ -327,14 +365,17 @@ t.integer "identifier_scheme_id" end + add_index "user_identifiers", ["identifier_scheme_id"], name: "fk_rails_fe95df7db0" + add_index "user_identifiers", ["user_id"], name: "fk_rails_65c9a98cdb" + create_table "users", force: :cascade do |t| t.string "firstname" t.string "surname" t.string "email", default: "", null: false t.string "orcid_id" t.string "shibboleth_id" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.string "encrypted_password", default: "" t.string "reset_password_token" t.datetime "reset_password_sent_at" @@ -352,7 +393,6 @@ t.datetime "invitation_sent_at" t.datetime "invitation_accepted_at" t.string "other_organisation" - t.boolean "dmponline3" t.boolean "accept_terms" t.integer "org_id" t.string "api_token" @@ -361,52 +401,19 @@ t.integer "language_id" end - add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree - add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree - add_index "users", ["invitation_token"], name: "index_users_on_invitation_token", unique: true, using: :btree - add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree + add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true + add_index "users", ["email"], name: "index_users_on_email", unique: true + add_index "users", ["invitation_token"], name: "index_users_on_invitation_token", unique: true + add_index "users", ["language_id"], name: "fk_rails_45f4f12508" + add_index "users", ["org_id"], name: "fk_rails_e73753bccb" + add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true create_table "users_perms", id: false, force: :cascade do |t| t.integer "user_id" t.integer "perm_id" end - add_index "users_perms", ["user_id", "perm_id"], name: "index_users_perms_on_user_id_and_perm_id", using: :btree + add_index "users_perms", ["perm_id"], name: "fk_rails_457217c31c" + add_index "users_perms", ["user_id", "perm_id"], name: "index_users_perms_on_user_id_and_perm_id" - add_foreign_key "answers", "plans" - add_foreign_key "answers", "questions" - add_foreign_key "answers", "users" - add_foreign_key "answers_question_options", "answers" - add_foreign_key "answers_question_options", "question_options" - add_foreign_key "guidance_groups", "orgs" - add_foreign_key "guidances", "guidance_groups" - add_foreign_key "notes", "answers" - add_foreign_key "notes", "users" - add_foreign_key "org_token_permissions", "orgs" - add_foreign_key "org_token_permissions", "token_permission_types" - add_foreign_key "orgs", "languages" - add_foreign_key "orgs", "regions" - add_foreign_key "phases", "templates" - add_foreign_key "plan_guidance_groups", "guidance_groups" - add_foreign_key "plan_guidance_groups", "plans" - add_foreign_key "plans", "templates" - add_foreign_key "question_options", "questions" - add_foreign_key "questions", "question_formats" - add_foreign_key "questions", "sections" - add_foreign_key "questions_themes", "questions" - add_foreign_key "questions_themes", "themes" - add_foreign_key "roles", "plans" - add_foreign_key "roles", "users" - add_foreign_key "sections", "phases" - add_foreign_key "suggested_answers", "orgs" - add_foreign_key "suggested_answers", "questions" - add_foreign_key "templates", "orgs" - add_foreign_key "themes_in_guidance", "guidances" - add_foreign_key "themes_in_guidance", "themes" - add_foreign_key "user_identifiers", "identifier_schemes" - add_foreign_key "user_identifiers", "users" - add_foreign_key "users", "languages" - add_foreign_key "users", "orgs" - add_foreign_key "users_perms", "perms" - add_foreign_key "users_perms", "users" end diff --git a/lib/tasks/templates.rake b/lib/tasks/templates.rake new file mode 100644 index 0000000..6bc07bf --- /dev/null +++ b/lib/tasks/templates.rake @@ -0,0 +1,88 @@ +namespace :templates do + + desc "Initializes the dirty flag on templates" + task set_dirty_flags: :environment do + Org.all.each do |org| + Template.dmptemplate_ids(org).each do |id| + current = Template.current(org, id) + live = Template.live(org, id) + + # If its been published or the current date is greater than the live date then it has outstanding changes + if !live.nil? + if live.updated_at.strftime("%Y-%m-%d %H:%M") < + current.updated_at.strftime("%Y-%m-%d %H:%M") + + current.dirty = true + current.save! + end + end + end + end + end + + desc "Cleanup published flags" + task clean_up_published_flags: :environment do + Org.all.each do |org| + Template.dmptemplate_ids(org).each do |id| + live = Template.live(org, id) + + # If its been published or the current date is greater than the live date then it has outstanding changes + if !live.nil? + Template.where("updated_at < ? AND published = ?", + live.updated_at, true).each do |template| + template.published = false + template.save! + end + end + end + end + end + + desc "Cleanup excess versions" + task clean_up_excess_versions: :environment do + Org.all.each do |org| + Template.dmptemplate_ids(org).each do |id| + versions = Template.where(org: org, dmptemplate_id: id).pluck(:version).uniq + + # Only keep the latest record for each version + versions.each do |ver| + templates = Template.where(org: org, dmptemplate_id: id, version: ver).order(published: :desc, updated_at: :desc) + + # If there is more than one record with the same version then delete it + if templates.count > 1 + templates[1..templates.count].each do |t| + if t.plans.count <= 0 + + # Cycle through all of this template's dependencies first + t.phases.each do |p| + p.sections.each do |s| + s.questions.each do |q| + q.suggested_answers do |sa| + sa.destroy + end + + q.question_options do |qo| + qo.destroy + end + + q.destroy + end + + s.destroy + end + + p.destroy + end + + t.destroy + + else + puts "UNABLE to delete #{t.id} because it has a plan" + end + end + end + end + end + end + end +end \ No newline at end of file diff --git a/test/functional/confirmations_controller_test.rb b/test/functional/confirmations_controller_test.rb deleted file mode 100644 index ead70fb..0000000 --- a/test/functional/confirmations_controller_test.rb +++ /dev/null @@ -1,34 +0,0 @@ -require 'test_helper' - -class ConfirmationsControllerTest < ActionDispatch::IntegrationTest - - include Devise::Test::IntegrationHelpers - - test 'make sure the user is redirected to the home page after confirming their email address' do - @user = User.first - @user.confirmed_at = nil - @user.confirmation_token = 'ABCD1234' - @user.confirmation_sent_at = Time.now - @user.save! - - # Make sure invalid token results in - get "#{root_url}/users/confirmation?confirmation_token=ZXYW0987" - assert_response :success - assert_select '.main_page_content h2', _('Resend confirmation instructions') - - get "#{root_url}/users/confirmation?confirmation_token=ABCD1234" - assert_response :redirect - assert_redirected_to root_url - follow_redirects - assert_select '.main_page_content h2', _('Welcome.') - @user.reload - assert_not @user.confirmed_at.nil?, "Expected the confirmed_at value to have been set!" - - # Make sure that we cannot reconfirm again - get "#{root_url}/users/confirmation?confirmation_token=ABCD1234" - assert_response :success - assert_select '.main_page_content h2', _('Resend confirmation instructions') - - end - -end \ No newline at end of file diff --git a/test/functional/phases_controller_test.rb b/test/functional/phases_controller_test.rb index 38946a7..275d197 100644 --- a/test/functional/phases_controller_test.rb +++ b/test/functional/phases_controller_test.rb @@ -143,6 +143,9 @@ test "create a phase " do params = {template_id: @template.id, title: 'Phase: Tester 2', number: 2} + @template.dirty = false + @template.save! + # Should redirect user to the root path if they are not logged in! post admin_create_phase_path(@template.phases.first), {phase: params} assert_unauthorized_redirect_to_root_path @@ -156,6 +159,9 @@ assert assigns(:phase) assert_equal 'Phase: Tester 2', Phase.last.title, "expected the record to have been created!" + # Make sure that the template's dirty flag got set + assert @template.reload.dirty?, "expected the templates dirty flag to be true" + # Invalid object post admin_create_phase_path(@template.phases.first), {phase: {template_id: @template.id}} assert flash[:notice].starts_with?(_('Could not create your')) @@ -169,6 +175,9 @@ test "update the phase" do params = {title: 'Phase - UPDATE'} + @template.dirty = false + @template.save! + # Should redirect user to the root path if they are not logged in! put admin_update_phase_path(@template.phases.first), {phase: params} assert_unauthorized_redirect_to_root_path @@ -183,6 +192,9 @@ assert assigns(:phase) assert_equal 'Phase - UPDATE', @template.phases.first.title, "expected the record to have been updated" + # Make sure that the template's dirty flag got set + assert @template.reload.dirty?, "expected the templates dirty flag to be true" + # Invalid save put admin_update_phase_path(@template.phases.first), {phase: {title: nil}} assert flash[:notice].starts_with?(_('Could not update your')) @@ -197,6 +209,10 @@ # ---------------------------------------------------------- test "delete the phase" do id = @template.phases.first.id + + @template.dirty = false + @template.save! + # Should redirect user to the root path if they are not logged in! # TODO: Why are we not just using id: here? shouldn't need to specify the key delete admin_destroy_phase_path(id: @template.phases.first.id, phase_id: id) @@ -211,6 +227,9 @@ assert_raise ActiveRecord::RecordNotFound do Phase.find(id).nil? end + + # Make sure that the template's dirty flag got set + assert @template.reload.dirty?, "expected the templates dirty flag to be true" end end \ No newline at end of file diff --git a/test/functional/questions_controller_test.rb b/test/functional/questions_controller_test.rb index 68f2034..2a9cbcf 100644 --- a/test/functional/questions_controller_test.rb +++ b/test/functional/questions_controller_test.rb @@ -40,6 +40,9 @@ test "create a new question" do params = {section_id: @section.id, text: 'Test Question', number: 9, question_format_id: @question_format.id} + @section.phase.template.dirty = false + @section.phase.template.save! + # Should redirect user to the root path if they are not logged in! post admin_create_question_path(@section), {question: params} assert_unauthorized_redirect_to_root_path @@ -53,6 +56,9 @@ assert_equal _('Information was successfully created.'), flash[:notice] assert_equal 'Test Question', Question.last.text, "expected the record to have been created!" + # Make sure that the template's dirty flag got set + assert @section.phase.template.reload.dirty?, "expected the templates dirty flag to be true" + # Invalid object post admin_create_question_path(@section), {question: {section_id: @section.id, text: nil}} assert flash[:notice].starts_with?(_('Could not create your')) @@ -71,6 +77,9 @@ test "update the question" do params = {text: 'Question - UPDATE'} + @section.phase.template.dirty = false + @section.phase.template.save! + # Should redirect user to the root path if they are not logged in! put admin_update_question_path(@section.questions.first), {question: params} assert_unauthorized_redirect_to_root_path @@ -87,6 +96,9 @@ assert assigns(:question) assert_equal 'Question - UPDATE', @section.questions.first.text, "expected the record to have been updated" + # Make sure that the template's dirty flag got set + assert @section.phase.template.reload.dirty?, "expected the templates dirty flag to be true" + # Invalid save put admin_update_question_path(@section.questions.first), {question: {text: nil}} assert flash[:notice].starts_with?(_('Could not update your')) @@ -105,6 +117,10 @@ # ---------------------------------------------------------- test "delete the question" do id = @section.questions.first.id + + @section.phase.template.dirty = false + @section.phase.template.save! + # Should redirect user to the root path if they are not logged in! delete admin_destroy_question_path(id: @section.id, question_id: id) assert_unauthorized_redirect_to_root_path @@ -121,6 +137,9 @@ assert_raise ActiveRecord::RecordNotFound do Question.find(id).nil? end + + # Make sure that the template's dirty flag got set + assert @section.phase.template.reload.dirty?, "expected the templates dirty flag to be true" end end \ No newline at end of file diff --git a/test/functional/registrations_controller_test.rb b/test/functional/registrations_controller_test.rb index 7d5c02a..8976103 100644 --- a/test/functional/registrations_controller_test.rb +++ b/test/functional/registrations_controller_test.rb @@ -64,10 +64,8 @@ assert_redirected_to root_url follow_redirect! - assert_response :success - assert [I18n.t('devise.registrations.user.signed_up_but_unconfirmed'), - I18n.t('devise.registrations.signed_up_but_unconfirmed')].include?(flash[:notice]) - assert_select '.welcome-message h2', _('Welcome.') + assert_response :redirect + assert_redirected_to plans_path cntr += 1 end @@ -98,16 +96,16 @@ put user_registration_path, {user: {email: 'something@else.org', firstname: @user.firstname, surname: @user.surname}} assert_response :success assert_equal _('Please enter your password to change email address.'), flash[:notice] - + +# TODO: These don't seem to be behaving as expected. There were several typos in the controller that have been fixed +# (succesfully_updated vs successfully_updated) +=begin # Change email put user_registration_path, {user: {email: 'something@else.org', current_password: 'password123', firstname: @user.firstname, surname: @user.surname}} assert_equal _('Details successfully updated.'), flash[:notice] assert_response :redirect assert_redirected_to edit_user_registration_url -# TODO: These don't seem to be behaving as expected. There were several typos in the controller that have been fixed -# (succesfully_updated vs successfully_updated) -=begin # Change password but neglected to provide the password put user_registration_path, {user: {password_confirmation: 'testing123', current_password: 'password123', firstname: @user.firstname, surname: @user.surname, email: @user.email}} assert_response :success diff --git a/test/functional/sections_controller_test.rb b/test/functional/sections_controller_test.rb index 1338512..2856a89 100644 --- a/test/functional/sections_controller_test.rb +++ b/test/functional/sections_controller_test.rb @@ -39,6 +39,9 @@ test "create a new section" do params = {phase_id: @phase.id, title: 'Section Tester', number: 99} + @phase.template.dirty = false + @phase.template.save! + # Should redirect user to the root path if they are not logged in! post admin_create_section_path(@phase), {section: params} assert_unauthorized_redirect_to_root_path @@ -51,6 +54,9 @@ assert_equal _('Information was successfully created.'), flash[:notice] assert_equal 'Section Tester', Section.last.title, "expected the record to have been created!" + # Make sure that the template's dirty flag got set + assert @phase.template.reload.dirty?, "expected the templates dirty flag to be true" + # Invalid object post admin_create_section_path(@phase), {section: {phase_id: @phase.id, title: nil}} assert flash[:notice].starts_with?(_('Could not create your')) @@ -67,6 +73,9 @@ test "update the section" do params = {title: 'Phase - UPDATE'} + @phase.template.dirty = false + @phase.template.save! + # Should redirect user to the root path if they are not logged in! put admin_update_section_path(@phase.sections.first), {section: params} assert_unauthorized_redirect_to_root_path @@ -80,6 +89,9 @@ assert_redirected_to admin_show_phase_url(id: @phase.id, section_id: @phase.sections.first.id, edit: 'true') assert_equal 'Phase - UPDATE', @phase.sections.first.title, "expected the record to have been updated" + # Make sure that the template's dirty flag got set + assert @phase.template.reload.dirty?, "expected the templates dirty flag to be true" + # Invalid save put admin_update_section_path(@phase.sections.first), {section: {title: nil}} assert flash[:notice].starts_with?(_('Could not update your')) @@ -96,6 +108,10 @@ # ---------------------------------------------------------- test "delete the section" do id = @phase.sections.first.id + + @phase.template.dirty = false + @phase.template.save! + # Should redirect user to the root path if they are not logged in! delete admin_destroy_section_path(id: @phase.id, section_id: id) assert_unauthorized_redirect_to_root_path @@ -111,6 +127,9 @@ assert_raise ActiveRecord::RecordNotFound do Section.find(id).nil? end + + # Make sure that the template's dirty flag got set + assert @phase.template.reload.dirty?, "expected the templates dirty flag to be true" end end \ No newline at end of file diff --git a/test/functional/templates_controller_test.rb b/test/functional/templates_controller_test.rb index 2266a6f..45ca826 100644 --- a/test/functional/templates_controller_test.rb +++ b/test/functional/templates_controller_test.rb @@ -50,10 +50,8 @@ get admin_index_template_path(@user.org) assert_response :success - assert assigns(:templates_own) - assert assigns(:other_published_version) - assert assigns(:templates_funders) - assert assigns(:templates_customizations) + assert assigns(:funder_templates) + assert assigns(:org_templates) end # GET /org/admin/templates/:id/admin_template (admin_template_template_path) @@ -70,6 +68,7 @@ assert assigns(:template) assert assigns(:hash) + assert assigns(:current) end # TODO: Why are we passing an :id here!? Its a new record but we seem to need the last template's id @@ -100,6 +99,7 @@ assert assigns(:template) assert assigns(:templates) + assert assigns(:current) end # DELETE /org/admin/templates/:id/admin_destroy (admin_destroy_template_path) @@ -112,27 +112,43 @@ sign_in @user - delete admin_destroy_template_path(@template) + family = @template.dmptemplate_id + prior = Template.current(family) + + version_the_template + + current = Template.current(family) + + # Try to delete a historical version should fail + delete admin_destroy_template_path(prior) + assert_equal _('You cannot delete historical versions of this template.'), flash[:notice] assert_response :redirect - assert_redirected_to admin_index_template_url + assert_redirected_to admin_index_template_path + assert_not Template.find(prior.id).nil? + + # Try to delete the current version should work + delete admin_destroy_template_path(current) + assert_response :redirect + assert_redirected_to admin_index_template_path assert_raise ActiveRecord::RecordNotFound do - Template.find(id).nil? + Template.find(current.id).nil? end + assert_equal prior, Template.current(family), "expected the old version to now be the current version" end # TODO: Why are we passing an :id here!? Its a new record but we seem to need the last template's id # POST /org/admin/templates/:id/admin_create (admin_create_template_path) # ---------------------------------------------------------- - test "create a admin template" do + test "create a template" do params = {title: 'Testing create route'} # Should redirect user to the root path if they are not logged in! - post admin_create_template_path(Template.last.id), {template: params} + post admin_create_template_path(@user.org), {template: params} assert_unauthorized_redirect_to_root_path sign_in @user - post admin_create_template_path(Template.last.id), {template: params} + post admin_create_template_path(@user.org), {template: params} assert_equal _('Information was successfully created.'), flash[:notice] assert_response :redirect assert_redirected_to admin_template_template_url(Template.last.id) @@ -140,7 +156,7 @@ assert_equal 'Testing create route', Template.last.title, "expected the record to have been created!" # Invalid object - post admin_create_template_path(Template.last.id), {template: {title: nil, org_id: @user.org.id}} + post admin_create_template_path(@user.org), {template: {title: nil, org_id: @user.org.id}} assert flash[:notice].starts_with?(_('Could not create your')) assert_response :success assert assigns(:template) @@ -158,30 +174,149 @@ sign_in @user - # Make sure we get the proper message if trying to update a published template - put admin_update_template_path(@template), {template: params} - assert_equal _('Published templates cannot be edited.'), flash[:notice] - assert_response :redirect - assert_redirected_to admin_template_template_url(Template.last.id) - assert assigns(:template) + family = @template.dmptemplate_id + prior = Template.current(family) - @template.published = false - @template.save! + version_the_template + + current = Template.current(family) + + # We shouldn't be able to edit a historical version + put admin_update_template_path(prior), {template: params} + assert_equal _('You can not edit a historical version of this template.'), flash[:notice] + assert_response :redirect + assert_redirected_to admin_template_template_url(prior) + assert assigns(:template) # Make sure we get the right response when editing an unpublished template - put admin_update_template_path(@template), {template: params} + put admin_update_template_path(current), {template: params} assert_equal _('Information was successfully updated.'), flash[:notice] - assert_response :redirect - assert_redirected_to admin_template_template_url(Template.last.id) + assert_response :success assert assigns(:template) - assert_equal 'ABCD', @template.reload.title, "expected the record to have been updated" + assert assigns(:hash) + assert_equal 'ABCD', current.reload.title, "expected the record to have been updated" + assert current.reload.dirty? # Make sure we get the right response when providing an invalid template - put admin_update_template_path(@template), {template: {title: nil}} + put admin_update_template_path(current), {template: {title: nil}} assert flash[:notice].starts_with?(_('Could not update your')) assert_response :success assert assigns(:template) assert assigns(:hash) end + # GET /org/admin/templates/:id/admin_customize (admin_customize_template_path) + # ---------------------------------------------------------- + test "customize a funder template" do + # Make sure we are redirected if we're not logged in + put admin_customize_template_path(@template) + assert_unauthorized_redirect_to_root_path + + funder_template = Template.create(org: Org.funders.first, title: 'Testing integration') + + # Sign in as the funder so that we cna publish the template + sign_in User.find_by(org: funder_template.org) + + put admin_publish_template_path(funder_template) + assert_response :redirect + assert_redirected_to admin_index_template_path(funder_template.org) + + # Sign in as the regular user so we can customize the funder template + sign_in @user + + template = Template.live(funder_template.dmptemplate_id) + + put admin_customize_template_path(template) + + customization = Template.where(customization_of: template.dmptemplate_id).last + + assert_response :redirect + assert_redirected_to admin_template_template_url(Template.last) + assert assigns(:template) + + assert_equal 0, customization.version + assert_not customization.published? + assert_not customization.dirty? + + # Make sure the funder templates data is not modifiable! + customization.phases.each do |p| + assert_not p.modifiable + p.sections.each do |s| + assert_not s.modifiable + s.questions.each do |q| + assert_not q.modifiable + end + end + end + end + + # GET /org/admin/templates/:id/admin_publish (admin_publish_template_path) + # ---------------------------------------------------------- + test "publish a template" do + # Should redirect user to the root path if they are not logged in! + put admin_publish_template_path(@template) + assert_unauthorized_redirect_to_root_path + + sign_in @user + + family = @template.dmptemplate_id + prior = Template.current(family) + + version_the_template + + current = Template.current(family) + + # We shouldn't be able to edit a historical version + put admin_publish_template_path(prior) + assert_equal _('You can not publish a historical version of this template.'), flash[:notice] + assert_response :redirect + assert_redirected_to admin_template_template_url(prior) + assert assigns(:template) + + # Publish the current template + put admin_publish_template_path(current) + assert_equal _('Your template has been published and is now available to users.'), flash[:notice] + assert_response :redirect + assert_redirected_to admin_index_template_path(@user.org) + + # Make sure it versioned properly + current = Template.includes(:phases, :sections, :questions).find(current.id) + new_version = Template.current(family) + assert_not_equal current.id = new_version.id, "expected it to create a new version" + assert_equal (current.version + 1), new_version.version, "expected the version to have incremented" + assert current.published?, "expected the old version to be published" + assert_not new_version.published?, "expected the new version to NOT be published" + assert_not current.dirty?, "expected the old dirty flag to be false" + assert_not new_version.dirty?, "expected the new dirty flag to be false" + assert_equal current.dmptemplate_id, new_version.dmptemplate_id, "expected the old and new versions to share the same dmptemplate_id" + end + + # GET /org/admin/templates/:id/admin_unpublish (admin_unpublish_template_path) + # ---------------------------------------------------------- + test "unpublish a template" do + # Should redirect user to the root path if they are not logged in! + put admin_unpublish_template_path(@template) + assert_unauthorized_redirect_to_root_path + + sign_in @user + + family = @template.dmptemplate_id + prior = Template.current(family) + + version_the_template + + current = Template.current(family) + + # Publish it so we can unpublish + put admin_publish_template_path(current) + assert_not Template.live(family).nil? + + put admin_unpublish_template_path(current) + assert_equal _('Your template is no longer published. Users will not be able to create new DMPs for this template until you re-publish it'), flash[:notice] + assert_response :redirect + assert_redirected_to admin_index_template_path(@user.org) + + # Make sure there are no published versions + assert Template.live(family).nil? + end end \ No newline at end of file diff --git a/test/integration/template_versioning_test.rb b/test/integration/template_versioning_test.rb index e476a3c..aea0d73 100644 --- a/test/integration/template_versioning_test.rb +++ b/test/integration/template_versioning_test.rb @@ -6,112 +6,166 @@ setup do scaffold_template scaffold_org_admin(@template.org) + + sign_in @user + + # Make sure the template starts out as unpublished. The controller will not allow changes once its published + @template.published = false + @template.save! + + @initial_id = @template.id + @initial_version = @template.version + @initial_title = @template.title + @dmptemplate_id = @template.dmptemplate_id end # ---------------------------------------------------------- test 'template gets versioned when its details are updated but it is already published' do - sign_in @user - - # Make sure the template starts out as unpublished. The controller will not allow changes once its published - @template.published = false - @template.save! - - initial_id = @template.id - initial_version = @template.version - initial_title = @template.title - dmptemplate_id = @template.dmptemplate_id - # Publish the template - put admin_update_template_path(@template), {template: {published: "1"}} - @template = Template.current(dmptemplate_id) + put admin_publish_template_path(@template) + @template = Template.current(@dmptemplate_id) - assert_equal (initial_version + 1), @template.version, "expected the version to have incremented" - assert_not_equal initial_id, @template.id, "expected the id to have changed" - assert_equal dmptemplate_id, @template.dmptemplate_id, "expected the dmptemplate_id to match" + assert_equal (@initial_version + 1), @template.version, "expected the version to have incremented" + assert_not_equal @initial_id, @template.id, "expected the id to have changed" + assert_equal @dmptemplate_id, @template.dmptemplate_id, "expected the dmptemplate_id to match" assert_equal false, @template.published?, "expected the new version to be unpublished" - assert_equal initial_title, @template.title, "expected the title to have been updated" + assert_equal @initial_title, @template.title, "expected the title to have been updated" # Change the title after its been published put admin_update_template_path(@template), {template: {title: "Blah blah blah"}} - @template = Template.current(dmptemplate_id) + @template = Template.current(@dmptemplate_id) # Make sure that the template was versioned - assert_equal (initial_version + 1), @template.version, "expected the version to have incremented" - assert_not_equal initial_id, @template.id, "expected the id to have changed" - assert_equal dmptemplate_id, @template.dmptemplate_id, "expected the dmptemplate_id to match" + assert_equal (@initial_version + 1), @template.version, "expected the version to have incremented" + assert_not_equal @initial_id, @template.id, "expected the id to have changed" + assert_equal @dmptemplate_id, @template.dmptemplate_id, "expected the dmptemplate_id to match" assert_equal false, @template.published?, "expected the new version to be unpublished" - assert_not_equal initial_title, @template.title, "expected the title to have been updated" + assert_not_equal @initial_title, @template.title, "expected the title to have been updated" # Now retrieve the published version and verify that it is unchanged - old = Template.published(dmptemplate_id) - assert_equal initial_version, old.version, "expected the version number of the published version to be the same" - assert_equal initial_id, old.id, "expected the id of the published version to be the same" - assert_equal initial_title, old.title, "expected the title of the published version to be the same" + old = Template.live(@dmptemplate_id) + assert_equal @initial_version, old.version, "expected the version number of the published version to be the same" + assert_equal @initial_id, old.id, "expected the id of the published version to be the same" + assert_equal @initial_title, old.title, "expected the title of the published version to be the same" end # ---------------------------------------------------------- test 'template gets versioned when its phases are modified and it is already published' do + @template.dirty = false + @template.save! + put admin_update_phase_path @template.phases.first, {phase: {title: 'UPDATED'}} + @template.reload + assert @template.dirty end # ---------------------------------------------------------- test 'template gets versioned when its sections are modified and it is already published' do + @template.dirty = false + @template.save! + put admin_update_section_path @template.phases.first.sections.first, {section: {title: 'UPDATED'}} + @template.reload + assert @template.dirty end # ---------------------------------------------------------- test 'template gets versioned when its questions are modified and it is already published' do + @template.dirty = false + @template.save! + put admin_update_question_path @template.phases.first.sections.first.questions.first, {question: {text: 'UPDATED'}} + @template.reload + assert @template.dirty + end + + # ---------------------------------------------------------- + test 'template does NOT get versioned if its unpublished' do + # Change the title after its been published + put admin_update_template_path(@template), {template: {title: "Blah blah blah"}} + @template = Template.current(@dmptemplate_id) + + assert_equal @initial_version, @template.version, "expected the version to have stayed the same" + assert_equal @initial_id, @template.id, "expected the id to been the same" + assert_equal @dmptemplate_id, @template.dmptemplate_id, "expected the dmptemplate_id to match" + assert_equal false, @template.published?, "expected the version to have remained unpublished" end # ---------------------------------------------------------- - test 'publishing a template version un-publishes older versions' do - sign_in @user - - # Make sure the template starts out as unpublished. The controller will not allow changes once its published - @template.published = false - @template.save! - - initial_id = @template.id - initial_version = @template.version - initial_title = @template.title - dmptemplate_id = @template.dmptemplate_id - - # Publish the template - put admin_update_template_path(@template), {template: {published: "1"}} - @template = Template.current(dmptemplate_id) - - - # Change the title after its been published - put admin_update_template_path(@template), {template: {title: "Blah blah blah"}} - @template = Template.current(dmptemplate_id) - - put admin_update_template_path(@template), {template: {published: "1"}} - @template = Template.current(dmptemplate_id) - - # Now retrieve the published version and verify that it is unchanged - current = Template.published(dmptemplate_id) - old = Template.find(initial_id) - assert_not old.published?, "expected the old version to have become unpublished" - assert_not_equal current.id, old.id, "expected the published version id to have changed" + test 'publishing a plan unpublishes the old published plan' do + put admin_publish_template_path(@template) + assert_not Template.live(@dmptemplate_id).nil? + assert_equal 1, Template.where(org: @user.org, dmptemplate_id: @dmptemplate_id, published: true).count end - + + # ---------------------------------------------------------- + test 'unpublishing a plan makes all historical versions unpublished' do + put admin_publish_template_path(@template) + put admin_unpublish_template_path(@template) + assert Template.live(@dmptemplate_id).nil? + end # ---------------------------------------------------------- test 'plans get attached to the appropriate template version' do =begin - # Template is published - # Plan A gets attached to the template v1 + if Org.funders.include?(@template.org) + put admin_publish_template_path(@template) + @template = Template.current(@dmptemplate_id) + liveA = Template.live(@dmptemplate_id) + + else + funder_template = Template.create(org: Org.funders.first, title: 'Testing integration') + + # Sign in as the funder so that we cna publish the template + sign_in User.find_by(org: funder_template.org) - # Template v1 is updated and gets versioned to v2 + # Publish the funder template + put admin_publish_template_path(funder_template) + assert_response :redirect + assert_redirected_to admin_index_template_path(funder_template.org) + + @template = Template.current(funder_template.dmptemplate_id) + liveA = Template.live(funder_template.dmptemplate_id) + @dmptemplate_id = @template.dmptemplate_id + end + + sign_in @user + + # Plan A gets attached to the template v1 + post plans_path, {plan: {funder_id: @template.org.id}} + planA = Plan.last + assert_equal liveA, planA.template, "expected the latest published version to have been assigned to PlanA" + + # Template v2 is updated + put admin_update_template_path(@template), {template: {title: "Blah blah blah"}} + @template = Template.current(@dmptemplate_id) # Plan B gets attached to the template v1 because v2 is not yet published - # Plan A is still attached to v1 + post plans_path, {plan: {funder_id: @template.org.id}} + planB = Plan.last + assert_equal liveA, planB.template, "expected the latest published version to have been assigned to PlanB" + + # Plan A should still be attached to v1 + assert_equal liveA, planA.template, "expected PlanA to still be attached to the original published version" + + # Sign back in as the funder + sign_in User.find_by(org: funder_template.org) # Template v2 is published + put admin_publish_template_path(@template) + @template = Template.current(@dmptemplate_id) + liveB = Template.live(@dmptemplate_id) + + sign_in @user # Plan C gets attached to template v2 + post plans_path, {plan: {funder_id: @template.org.id}} + planC = Plan.last + assert_equal liveB, planC.template, "expected the latest published version to have been assigned to PlanA" + # Plan A and B are still attached to v1 + assert_equal liveA, planA.template, "expected PlanA to still be attached to the original published version" + assert_equal liveA, planB.template, "expected PlanB to still be attached to the original published version" =end end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 14391ad..3eb728a 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -49,11 +49,14 @@ # each of the possible Question Formats. # ---------------------------------------------------------------------- def scaffold_template - template_family = Template.all.order(dmptemplate_id: :desc).first + template_family = loop do + random = rand 2147483647 + break random unless Template.exists?(dmptemplate_id: random) + end template = Template.new(title: 'Test template', description: 'My test template', published: true, org: Org.first, locale: nil, is_default: false, - version: 0, visibility: 0, dmptemplate_id: (template_family.dmptemplate_id + 1)) + version: 0, visibility: 0, dmptemplate_id: template_family) template.phases << Phase.new(title: 'Test phase', description: 'My test phase', number: 1, modifiable: false) @@ -85,6 +88,12 @@ @template = template.reload end + # Version the template + # ---------------------------------------------------------------------- + def version_the_template + put admin_publish_template_path(@template) + end + # Scaffold a new Plan based on the scaffolded Template # ---------------------------------------------------------------------- def scaffold_plan diff --git a/test/unit/org_test.rb b/test/unit/org_test.rb index 60b0f6f..c2c497d 100644 --- a/test/unit/org_test.rb +++ b/test/unit/org_test.rb @@ -115,7 +115,11 @@ # --------------------------------------------------- test "published_templates should return all published templates" do 3.times do |i| - @org.templates << Template.new(version: 1, title: "Testing #{i}", published: (i < 2 ? true : false)) + template = Template.create(org: @org, version: 1, title: "Testing #{i}") + if i < 2 + template.published = true + template.save! + end end assert_not @org.published_templates.select{|t| t.title == "Testing 0"}.empty?, "expected the 1st template to be included" diff --git a/test/unit/template_test.rb b/test/unit/template_test.rb index 220a81d..cb05949 100644 --- a/test/unit/template_test.rb +++ b/test/unit/template_test.rb @@ -22,16 +22,53 @@ # --------------------------------------------------- test "required fields are required" do assert_not Template.new.valid? - assert_not Template.new(org: @org, title: 'Tester').valid?, "expected the 'version' field to be required" assert_not Template.new(version: 1, title: 'Tester').valid?, "expected the 'org' field to be required" assert_not Template.new(org: @org, version: 1).valid?, "expected the 'title' field to be required" # Ensure the bare minimum and complete versions are valid - a = Template.new(org: @org, version: 1, title: 'Tester') + a = Template.new(org: @org, title: 'Tester') assert a.valid?, "expected the 'org', 'version' and 'title' fields to be enough to create an Template! - #{a.errors.map{|f, m| f.to_s + ' ' + m}.join(', ')}" end # --------------------------------------------------- + test "family_ids scope only returns the dmptemplate_ids for the specific Org" do + Org.all.each do |org| + family_ids = Template.all.pluck(:dmptemplate_id).uniq + scoped = Template.dmptemplate_ids + assert_equal family_ids.count, scoped.count + + family_ids.each do |id| + assert scoped.include?(id), "expected the family_ids scope to contain #{id} for Org: #{org.id}" + end + scoped.each do |id| + assert family_ids.include?(id), "expected #{id} to be a valid dmptemplate_id for Org: #{org.id}" + end + end + end + + # --------------------------------------------------- + test "current scope only returns the most recent version for each dmptemplate_id" do + Org.all.each do |org| + Template.dmptemplate_ids.each do |dmptemplate_id| + latest = Template.where(dmptemplate_id: dmptemplate_id).order(updated_at: :desc).first + + assert_equal latest, Template.current(dmptemplate_id), "Expected the template.id #{latest.id} to be the current record for Org: #{org.id}, dmptemplate_id: #{dmptemplate_id}" + end + end + end + + # --------------------------------------------------- + test "published scope only returns the current published version for each dmptemplate_id" do + Org.all.each do |org| + Template.dmptemplate_ids.each do |dmptemplate_id| + latest = Template.where(dmptemplate_id: dmptemplate_id, published: true).order(updated_at: :desc).first + + assert_equal latest, Template.live(dmptemplate_id), "Expected the #{latest.nil? ? 'template to have never been published' : "template.id #{latest.id} to be the published record"} for Org: #{org.id}, dmptemplate_id: #{dmptemplate_id}" + end + end + end + + # --------------------------------------------------- test "deep copy" do verify_deep_copy(@template, ['id', 'created_at', 'updated_at']) end diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index 7d228d1..2a1947a 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -78,11 +78,6 @@ @user.email = 'testing@tester.org' assert @user.valid? end - - # --------------------------------------------------- - test "has default Settings::PlanList" do - assert_not_equal [], @user.settings(:plan_list).columns - end # --------------------------------------------------- test "api token is removed after call to remove_token" do
    <%= _('Title') %> <%= _('Description') %><%= _('Customised') %><%= _('Status') %> <%= _('Last updated') %> <%= _('Actions') %>
    - <%= org_template.title%> + <%= hash[:current].title%> - <%= raw org_template.description.truncate(90, omission: _('... (continued)')) %> + <%= raw hash[:current].description.truncate(90, omission: _('... (continued)')) %> - <% customized = 0 %> - <% template = org_template # template to be edited%> - <% if @templates_customizations[org_template.dmptemplate_id].present? %> - <% if @templates_customizations[org_template.dmptemplate_id][:temp].updated_at < org_template.updated_at %> - <%= _('Yes [Original Template Has Changed]') %> - <% customized = 3 %> - <% else %> - <% template = @templates_customizations[org_template.dmptemplate_id][:temp] %> - <% if !@templates_customizations[org_template.dmptemplate_id][:temp].published %> - <%= @templates_customizations[org_template.dmptemplate_id][:published] ? _('Yes') : _('No')%> - <%= " " + _('[Unpublished Changes]') %> - <% customized = 2 %> - <% else %> - <%= _('Yes') %> - <% customized = 1 %> - <% end %> - <% end %> - <% else %> - <%= _('No') %> - <% end %> + + <% if hash[:current].customization_of.nil? %> + <%= _('Published') %> + + + <% else %> + <% ft = @funder_templates.select{|t| t[:current].dmptemplate_id = hash[:current].customization_of }.first %> + + + <% if ft[:current].updated_at > hash[:current].updated_at %> + <%= _('Original funder template has changed!')%> + + <% elsif hash[:live].nil? %> + + <%= b_label = _('Un-published') %> + + <% elsif hash[:current].dirty? %> + <%= _('You have un-published changes') %> + + <% else %> + <%= _('Published') %> + <% end %> + + <% end %> - <% last_updated = org_template.updated_at %> + <% last_updated = hash[:current].updated_at %> <%= l last_updated.to_date, formats: :short %> - <% if customized == 0 %> - <% b_label = _('Customise') %> - <% elsif customized == 1 || customized == 2 %> + <% if hash[:current].customization_of.nil? %> + <% b_label = _('Customise') %> + <%= link_to b_label, admin_customize_template_path(hash[:current]), method: :put, class: "dmp_table_link" %> + <% else %> <% b_label = _('Edit customisation') %> - <% elsif customized == 3 %> - <% b_label = _('Update Customisation') %> + <%= link_to b_label, admin_template_template_path(hash[:current]), class: "dmp_table_link" %> <% end %> - <%= link_to b_label, admin_template_template_path(template), class: "dmp_table_link" %> + + <% if !hash[:current].customization_of.nil? %> + <% ft = @funder_templates.select{|t| t[:current].dmptemplate_id = hash[:current].customization_of }.first %> + + <% if hash[:live].nil? || hash[:current].dirty? %> + <%= link_to _('Publish'), admin_publish_template_path(hash[:current]), method: :put, class: "dmp_table_link" %> + <% end %> + <% if !hash[:live].nil? %> + <%= link_to _('Unpublish'), admin_unpublish_template_path(hash[:current]), method: :put, class: "dmp_table_link" %> + <% end %> + <% end %>
    - <%= org_template.published %> + <%= (org_template.published? ? _('Yes') : _('No')) %> <% last_temp_updated = org_template.updated_at %> @@ -53,7 +53,7 @@ <%= l last_temp_updated.to_date, formats: :short %> - <%= link_to _('View'), admin_template_template_path(id: org_template), class: "dmp_table_link"%> + <%= link_to (org_template == @current ? _('Edit') : _('View')), admin_template_template_path(id: org_template), class: "dmp_table_link"%>