Merge pull request #423 from DigitalCurationCentre/xsrust/bugfixes

Xsrust/bugfixes

Author: briri

app/controllers/phases_controller.rb

@@ -118,6 +118,11 @@ def admin_show
     if params.has_key?(:question_id)
       @question_id = params[:question_id].to_i
     end
+    if @phase.template.customization_of.present?
+      @original_org = Template.where(dmptemplate_id: @phase.template.customization_of).first.org
+    else
+      @original_org = @phase.template.org
+    end
   end
 
 
@@ -179,6 +184,11 @@ def admin_update
       @section_id = (params[:section_id].nil? ? nil : params[:section_id].to_i)
       @question_id = (params[:question_id].nil? ? nil : params[:question_id].to_i)
       flash[:notice] = failed_update_error(@phase, _('phase'))
+      if @phase.template.customization_of.present?
+        @original_org = Template.where(dmptemplate_id: @phase.template.customization_of).first.org
+      else
+        @original_org = @phase.template.org
+      end
       render 'admin_show'
     end
   end
@@ -203,6 +213,11 @@ def admin_destroy
       @section_id = (params[:section_id].nil? ? nil : params[:section_id].to_i)
       @question_id = (params[:question_id].nil? ? nil : params[:question_id].to_i)
       flash[:notice] = failed_destroy_error(@phase, _('phase'))
+      if @phase.template.customization_of.present?
+        @original_org = Template.where(dmptemplate_id: @phase.template.customization_of).first.org
+      else
+        @original_org = @phase.template.org
+      end
       render 'admin_show'
     end
   end

app/controllers/questions_controller.rb

@@ -35,18 +35,23 @@ def admin_create
         @question_id = @question.id
 
         flash[:notice] = failed_create_error(@question, _('question'))
+        if @phase.template.customization_of.present?
+          @original_org = Template.where(dmptemplate_id: @phase.template.customization_of).first.org
+        else
+          @original_org = @phase.template.org
+        end
         render template: 'phases/admin_show'
       end
     rescue ActionController::ParameterMissing => e
-      flash[:notice] = e.message    
+      flash[:notice] = e.message
     end
   end
 
   #update a question of a template
   def admin_update
     @question = Question.find(params[:id])
     authorize @question
-    guidance = @question.get_guidance_annotation(current_user.org_id) 
+    guidance = @question.get_guidance_annotation(current_user.org_id)
     if params["question-guidance-#{params[:id]}"].present?
       if guidance.blank?
         guidance = @question.annotations.build
@@ -76,6 +81,11 @@ def admin_update
       @question_id = @question.id
 
       flash[:notice] = failed_update_error(@question, _('question'))
+      if @phase.template.customization_of.present?
+        @original_org = Template.where(dmptemplate_id: @phase.template.customization_of).first.org
+      else
+        @original_org = @phase.template.org
+      end
       render template: 'phases/admin_show'
     end
   end
@@ -89,7 +99,7 @@ def admin_destroy
     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')

app/controllers/sections_controller.rb

@@ -12,7 +12,7 @@ def admin_create
     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
@@ -22,6 +22,11 @@ def admin_create
       @section_id = @section.id
       @question_id = nil
       flash[:notice] = failed_create_error(@section, _('section'))
+      if @phase.template.customization_of.present?
+        @original_org = Template.where(dmptemplate_id: @phase.template.customization_of).first.org
+      else
+        @original_org = @phase.template.org
+      end
       render template: 'phases/admin_show'
     end
   end
@@ -36,7 +41,7 @@ def admin_update
     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)
@@ -45,6 +50,11 @@ def admin_update
       @section_id = @section.id
       @question_id = nil
       flash[:notice] = failed_update_error(@section, _('section'))
+      if @phase.template.customization_of.present?
+        @original_org = Template.where(dmptemplate_id: @phase.template.customization_of).first.org
+      else
+        @original_org = @phase.template.org
+      end
       render template: 'phases/admin_show'
     end
   end
@@ -55,22 +65,27 @@ def admin_destroy
     @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)
       @open = true
       @sections = @phase.sections
       @section_id = @section.id
       @question_id = nil
-      
+
       flash[:notice] = failed_destroy_error(@section, _('section'))
+      if @phase.template.customization_of.present?
+        @original_org = Template.where(dmptemplate_id: @phase.template.customization_of).first.org
+      else
+        @original_org = @phase.template.org
+      end
       render template: 'phases/admin_show'
     end
   end
-  
+
 end

app/controllers/templates_controller.rb

@@ -117,7 +117,7 @@ def admin_transfer_customization
           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)
+            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

app/models/template.rb

@@ -55,7 +55,6 @@ def self.org_customizations(dmptemplate_id, org_id)
     Template.where(customization_of: dmptemplate_id, org_id: org_id).order(version: :desc).valid.first
   end
 
-
   ##
   # deep copy the given template and all of it's associations
   #

app/views/layouts/_signin_signout.html.erb

@@ -12,7 +12,9 @@
             <li><%= link_to _('Super admin area'), "/admin", class: "signIn_dropdown_link" %></li>
           <% end %>
           <% if current_user.can_org_admin? && !current_user.org_id.nil? %>
-            <% if current_user.can_modify_templates? %>
+            <% if current_user.can_modify_org_details? && current_user.org.abbreviation.blank? %>
+              <li><%= link_to _("Admin area"), admin_show_org_path(current_user.org_id), class: "signIn_dropdown_link" %></li>
+            <% elsif  current_user.can_modify_templates?%>
               <li><%= link_to _("Admin area"), admin_index_template_path(current_user.org_id), class: "signIn_dropdown_link" %></li>
             <% elsif current_user.can_modify_guidance? %>
               <li><%= link_to _("Admin area"), admin_index_guidance_path(current_user.org_id), class: "signIn_dropdown_link" %></li>

app/views/orgs/admin_show.html.erb

@@ -28,6 +28,10 @@
 				<td class="first"><%= _('Abbreviation') %></td>
 				<td><%= @org.abbreviation %></td>
 			</tr>
+      <% else %>
+      <tr>
+        <td class="first"><%= _('Abbreviation') %></td>
+        <td><emph><%= _('Please add an abbreviation to your org for display with annotations!')%></emph></td>
 			<% end %>
 
       <% if @org.banner_text.present? then %>

app/views/questions/_show_question.html.erb

@@ -63,7 +63,7 @@
 
     <!-- Suggested answer or Example-->
     <% if !question.section.phase.template.org.funder? %>
-      <% example_answer = question.get_example_answer(current_user.org_id) %>
+      <% example_answer = question.get_example_answer(@original_org.id) %>
       <% if example_answer.present?  && example_answer.text.present?  %>
         <tr>
           <td class="first_template">
@@ -74,7 +74,7 @@
       <% end %>
     <% end %>
     <!-- Guidance linked to this question -->
-    <% guidance = question.get_guidance_annotation(current_user.org_id) %>
+    <% guidance = question.get_guidance_annotation(@original_org.id) %>
     <% if guidance.present?  %>
       <tr>
         <td class="first_template"><%= _('Guidance')%></td>

config/initializers/fast_gettext.rb

@@ -12,7 +12,7 @@ def get_default_locale
     return language.nil? ? 'en_GB' : language.abbreviation
 end
 
-FastGettext.add_text_domain 'app', :path => 'config/locale', :type => :po, :ignore_fuzzy => true
+FastGettext.add_text_domain 'app', :path => 'config/locale', :type => :po, :ignore_fuzzy => true, :report_warning => false
 FastGettext.default_text_domain = 'app'
 FastGettext.default_available_locales = get_available_locales()
 FastGettext.default_locale = get_default_locale()

config/locale/app.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-08 14:43+0000\n"
-"PO-Revision-Date: 2017-06-08 14:43+0000\n"
+"POT-Creation-Date: 2017-06-15 12:42+0000\n"
+"PO-Revision-Date: 2017-06-15 12:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "Language: \n"
@@ -351,6 +351,9 @@ msgstr ""
 msgid "Bad Credentials"
 msgstr ""
 
+msgid "Bad Parameters"
+msgstr ""
+
 msgid "Before submitting, please consider:"
 msgstr ""
 
@@ -435,6 +438,9 @@ msgstr ""
 msgid "Create a template"
 msgstr ""
 
+msgid "Create account"
+msgstr ""
+
 msgid "Create plan"
 msgstr ""
 
@@ -966,6 +972,9 @@ msgstr ""
 msgid "Plan was successfully updated."
 msgstr ""
 
+msgid "Please add an abbreviation to your org for display with annotations!"
+msgstr ""
+
 msgid "Please enter a First name."
 msgstr ""
 
@@ -1188,9 +1197,6 @@ msgstr ""
 msgid "Sign out"
 msgstr ""
 
-msgid "Create account"
-msgstr ""
-
 msgid "Signed in as "
 msgstr ""
 
@@ -1650,6 +1656,9 @@ msgstr ""
 msgid "must have access to guidances api"
 msgstr ""
 
+msgid "must have access to plans api"
+msgstr ""
+
 msgid "no research organisation is associated with this plan"
 msgstr ""
 
@@ -1698,14 +1707,5 @@ msgstr ""
 msgid "user"
 msgstr ""
 
-msgid "{\"Error\":\"Organisation does not exist\"}"
-msgstr ""
-
-msgid "{\"Error\":\"Organisation has more than one template and template name unspecified or invalid\"}"
-msgstr ""
-
-msgid "{\"Error\":\"Organisation specified is not a funder\"}"
-msgstr ""
-
-msgid "{\"Error\":\"You do not have authorisation to view this endpoint\"}"
+msgid "user must be in your organisation"
 msgstr ""