Merge pull request #329 from DigitalCurationCentre/vyruss/bugfixes

Vyruss/bugfixes

Author: vyruss

app/controllers/admin/annotations_controller.rb

@@ -5,14 +5,14 @@ class AnnotationsController < Admin::ApplicationController
     #
     # def index
     #   super
-    #   @resources = SuggestedAnswer.
+    #   @resources = Annotation.
     #     page(params[:page]).
     #     per(10)
     # end
 
     # Define a custom finder by overriding the `find_resource` method:
     # def find_resource(param)
-    #   SuggestedAnswer.find_by!(slug: param)
+    #   Annotation.find_by!(slug: param)
     # end
 
     # See https://administrate-prototype.herokuapp.com/customizing_controller_actions

app/controllers/registrations_controller.rb

@@ -40,10 +40,10 @@ def create
       redirect_to after_sign_up_error_path_for(resource), alert: _('You must accept the terms and conditions to register.')
     else
       existing_user = User.find_by_email(sign_up_params[:email])
-      if !existing_user.nil? then
-        if (existing_user.password == "" || existing_user.password.nil?) && existing_user.confirmed_at.nil? then
-          @user = existing_user
-          do_update(false, true)
+      if !existing_user.nil? # If email exists
+        if (existing_user.password == "" || existing_user.password.nil?) && existing_user.confirmed_at.nil? # If user has not accepted invitation yet
+          existing_user.destroy # Only solution for now
+          super
         else
           redirect_to after_sign_up_error_path_for(resource), alert: _('That email address is already registered.')
         end
@@ -91,16 +91,16 @@ def needs_password?(user, params)
   end
 
   def do_update(require_password = true, confirm = false)
-    if require_password                        # user is changing email or password
-      if current_user.email != params[:user][:email]   # if user changing email
-        if params[:user][:current_password].blank?    # password needs to be present
+    if require_password                              # user is changing email or password
+      if current_user.email != params[:user][:email]   # if user is changing email
+        if params[:user][:current_password].blank?       # password needs to be present
           message = _('Please enter your password to change email address.')
           successfully_updated = false
         else
           successfully_updated = current_user.update_with_password(password_update)
         end
-      elsif params[:user][:password].present? # user is changing password
-        successfully_updated = false      # shared across first 3 conditions
+      elsif params[:user][:password].present?          # if user is changing password
+        successfully_updated = false                     # shared across first 3 conditions
         if params[:user][:current_password].blank?
           message = _('Please enter your current password')
         elsif params[:user][:password_confirmation].blank?
@@ -110,10 +110,10 @@ def do_update(require_password = true, confirm = false)
         else
           successfully_updated = current_user.update_with_password(password_update)
         end
-      else    # potentially unreachable... but I dont like to leave off the else
+      else                                           # potentially unreachable... but I dont like to leave off the else
         successfully_updated = current_user.update_with_password(password_update)
       end
-    else        # password not required
+    else                                             # password not required
       successfully_updated = current_user.update_without_password(update_params)
     end
 
@@ -125,7 +125,7 @@ def do_update(require_password = true, confirm = false)
     #render the correct page
     if successfully_updated
       if confirm
-        current_user.skip_confirmation!
+        current_user.skip_confirmation! # will error out if confirmable is turned off in user model
         current_user.save!
       end
       session[:locale] = current_user.get_locale unless current_user.get_locale.nil?

app/dashboards/annotation_dashboard.rb

@@ -12,7 +12,7 @@ class AnnotationDashboard < Administrate::BaseDashboard
     question: Field::BelongsTo,
     id: Field::Number,
     text: Field::Text,
-    type: Field::integer,
+    type: Field::String.with_options(searchable: false),
     created_at: Field::DateTime,
     updated_at: Field::DateTime,
   }.freeze
@@ -51,10 +51,10 @@ class AnnotationDashboard < Administrate::BaseDashboard
     :type,
   ].freeze
 
-  # Overwrite this method to customize how suggested answers are displayed
+  # Overwrite this method to customize how annotations are displayed
   # across all pages of the admin dashboard.
   #
-  # def display_resource(suggested_answer)
-  #   "SuggestedAnswer ##{suggested_answer.id}"
+  # def display_resource(annotation)
+  #   "Annotation ##{annotation.id}"
   # end
 end

app/views/administrate/application/_search.html.erb

@@ -0,0 +1,21 @@
+<form class="search">
+  <span class="search__icon">
+    <%= image_tag "administrate/search.svg", alt: "search", width: 16, height: 16 %>
+  </span>
+  <input
+    type="text"
+    name="search"
+    class="search__input"
+    placeholder="Search"
+    value="<%= search_term %>"
+    aria-label="Search"
+  />
+  <span class="search__hint">
+    Press enter to search
+  </span>
+  <span class="search__clear">
+    <%= link_to clear_search_params do %>
+      <%= image_tag "administrate/cancel.svg", alt: "cancel-search", width: 16, height: 16 %>
+    <% end %>
+  </span>
+</form>

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-05-15 20:57+0000\n"
-"PO-Revision-Date: 2017-05-15 20:57+0000\n"
+"POT-Creation-Date: 2017-05-19 17:36+0100\n"
+"PO-Revision-Date: 2017-05-19 17:36+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "Language: \n"
@@ -24,7 +24,10 @@ msgstr ""
 msgid " - "
 msgstr ""
 
-msgid " I accept the <a href=\"/%{current_locale}/terms\" target=\"_blank\">terms and conditions</a> *"
+msgid " Guidance"
+msgstr ""
+
+msgid " I accept the <a href=\"/terms\" target=\"_blank\">terms and conditions</a> *"
 msgstr ""
 
 msgid " Plan"
@@ -252,6 +255,9 @@ msgstr ""
 msgid "Add collaborator"
 msgstr ""
 
+msgid "Add example answer"
+msgstr ""
+
 msgid "Add guidance"
 msgstr ""
 
@@ -273,9 +279,6 @@ msgstr ""
 msgid "Add section"
 msgstr ""
 
-msgid "Add suggested answer/ example"
-msgstr ""
-
 msgid "Additional comment area will be displayed."
 msgstr ""
 
@@ -303,6 +306,9 @@ msgstr ""
 msgid "Answered"
 msgstr ""
 
+msgid "Answered "
+msgstr ""
+
 msgid "Answered at"
 msgstr ""
 
@@ -342,6 +348,9 @@ msgstr ""
 msgid "Before you get started, we need to ask a few questions to set you up with the best DMP template for your needs."
 msgstr ""
 
+msgid "Begin typing to see a filtered list"
+msgstr ""
+
 msgid "Below is a list of users registered for your organisation. You can sort the data by each field."
 msgstr ""
 
@@ -465,6 +474,9 @@ msgstr ""
 msgid "Display additional comment area."
 msgstr ""
 
+msgid "Draft"
+msgstr ""
+
 msgid "Dropdown"
 msgstr ""
 
@@ -474,6 +486,9 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
+msgid "Edit Example of Answer"
+msgstr ""
+
 msgid "Edit User Privileges"
 msgstr ""
 
@@ -495,9 +510,6 @@ msgstr ""
 msgid "Edit question"
 msgstr ""
 
-msgid "Edit suggested answer/ example"
-msgstr ""
-
 msgid "Edit template details"
 msgstr ""
 
@@ -537,6 +549,12 @@ msgstr ""
 msgid "Error!"
 msgstr ""
 
+msgid "Example Answer"
+msgstr ""
+
+msgid "Example of Answer"
+msgstr ""
+
 msgid "Example of answer"
 msgstr ""
 
@@ -942,6 +960,9 @@ msgstr ""
 msgid "Please enter your current password below when changing your email address."
 msgstr ""
 
+msgid "Please enter your email"
+msgstr ""
+
 msgid "Please enter your first name."
 msgstr ""
 
@@ -969,9 +990,6 @@ msgstr ""
 msgid "Please select one"
 msgstr ""
 
-msgid "Policy Expectations"
-msgstr ""
-
 msgid "Preview"
 msgstr ""
 
@@ -1233,9 +1251,6 @@ msgstr ""
 msgid "This document was generated by %{application_name}"
 msgstr ""
 
-msgid "This must be a valid email address - a message will be sent to it for confirmation."
-msgstr ""
-
 msgid "This must match what you entered in the previous field."
 msgstr ""
 
@@ -1392,12 +1407,18 @@ msgstr ""
 msgid "You are about to delete a suggested answer/ example for '%{question_text}'. Are you sure?"
 msgstr ""
 
+msgid "You are about to delete an example answer for '%{question_text}'. Are you sure?"
+msgstr ""
+
 msgid "You are not authorized to perform this action."
 msgstr ""
 
 msgid "You are viewing a historical version of this template. You will not be able to make changes."
 msgstr ""
 
+msgid "You can add an example answer to help users respond. These will be presented above the answer box and can be copied/ pasted."
+msgstr ""
+
 msgid "You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted."
 msgstr ""
 
@@ -1527,6 +1548,9 @@ msgstr ""
 msgid "by"
 msgstr ""
 
+msgid "by "
+msgstr ""
+
 msgid "can't be blank"
 msgstr ""
 
@@ -1539,6 +1563,9 @@ msgstr ""
 msgid "e.g. School/ Department"
 msgstr ""
 
+msgid "example answer"
+msgstr ""
+
 msgid "from now"
 msgstr ""
 
@@ -1596,9 +1623,6 @@ msgstr ""
 msgid "or copy"
 msgstr ""
 
-msgid "org_admin.templates.edit_phase_label"
-msgstr ""
-
 msgid "organisation"
 msgstr ""
 
@@ -1632,9 +1656,6 @@ msgstr ""
 msgid "select at least one theme"
 msgstr ""
 
-msgid "suggested answer"
-msgstr ""
-
 msgid "template"
 msgstr ""