udongo 5.8.0 → 5.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e012e2dccbe75d74ea00c84ab30ae20423be0be1
-  data.tar.gz: b7b476f535941b05b5b7d857f15819af1c5f2753
+  metadata.gz: 3ce4d4a15bc9ca2173d65611f6cfe39d92c8a2aa
+  data.tar.gz: 5545139075d1cac88213402b77c12d6d43f12137
 SHA512:
-  metadata.gz: e1e04b226920a07f783df0bd889920bc137905ce349df750acd05f9b056462cf55addd1f357e6b966cb200a0b65cb6fe585a40a4d398572a751bd94d1be7e047
-  data.tar.gz: 90bed388b48beb7a0e1a19b44209558cfc01928b112490064f251dfade8204bbd2065995f6c612d96bf9c9a9362c9f7fd40204c5011e33df480a76df022ffaaa
+  metadata.gz: 0724a9d61b1b0418ca16b73843b7688d48babe0c8147b4c4c6472712f280bfbfb79e73572f8617cc9aeea95b5d0694ebe03720427d112c503ade039455e2286a
+  data.tar.gz: 4940bb72cb0f5e2644e03f125a0dcbd6245e334d8c77040577d59cf3bc737d95c9921c9e9838a8a49f1002cf3e1e12f2c7f7a6e47d4b449a9d863617dea037aa

data/app/assets/javascripts/backend/general.js

@@ -1,6 +1,7 @@
 var general = general || {
   init: function() {
     $('form:not(.no-focus) input:visible:not(.no-focus):first').focus();
+    $('[data-toggle="tooltip"]').tooltip();
   }
 };
 

data/app/assets/javascripts/backend/tree.js

@@ -63,7 +63,7 @@ var tree = tree || {
 
   contextmenu_remove_listener: function(obj) {
     var instance = tree.vars.container.jstree(true);
-    var node = instance.get_node(obj.reference.prevObject.selector);
+    var node = instance.get_node(obj.reference);
 
     $.ajax({
       data: { id: node.data.id },
@@ -80,7 +80,7 @@ var tree = tree || {
 
   contextmenu_toggle_visibility_listener: function(obj) {
     var instance = tree.vars.container.jstree(true);
-    var node = instance.get_node(obj.reference.prevObject.selector);
+    var node = instance.get_node(obj.reference);
 
     $.ajax({
       data: { id: node.data.id },

data/app/controllers/backend/forms/base_controller.rb

@@ -0,0 +1,9 @@
+class Backend::Forms::BaseController < Backend::BaseController
+  before_action :find_form
+
+  private
+
+  def find_form
+    @form = Form.find(params[:form_id]).decorate
+  end
+end

data/app/controllers/backend/forms/fields_controller.rb

@@ -0,0 +1,63 @@
+class Backend::Forms::FieldsController < Backend::Forms::BaseController
+  include Concerns::Backend::TranslatableController
+  include Concerns::Backend::PositionableController
+  include Concerns::PaginationController
+
+  before_action :find_model, only: [:edit, :update, :destroy]
+  before_action -> do
+    breadcrumb.add t('b.forms'), backend_forms_path
+    breadcrumb.add @form.description, edit_backend_form_path(@form)
+  end
+
+  def new
+    @field = @form.fields.new
+  end
+
+  def create
+    @field = @form.fields.new(allowed_params)
+
+    if @field.save
+      redirect_to edit_translation_backend_form_field_path(@form, @field, locale),
+        notice: translate_notice(:added, :form_field)
+    else
+      render :new
+    end
+  end
+
+  def update
+    if @field.update_attributes allowed_params
+      redirect_to backend_form_fields_path(@form),
+                  notice: translate_notice(:edited, :form_field)
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    @field.destroy
+    redirect_to backend_form_fields_path(@form),
+                notice: translate_notice(:deleted, :form_field)
+  end
+
+  private
+
+  def allowed_params
+    params[:form_field].permit(:identifier, :field_type, :presence, :email)
+  end
+
+  def find_model
+    @field ||= @form.fields.find(params[:id])
+  end
+
+  def translation_form
+    Backend::FormFieldTranslationForm.new(
+      @field,
+      @field.translation(params[:translation_locale])
+    )
+  end
+
+  def translatable_path
+    method = "edit_translation_backend_#{model_name}_path"
+    @translatable_path || send(method, @form, @model, params[:translation_locale])
+  end
+end

data/app/controllers/backend/forms/submissions_controller.rb

@@ -0,0 +1,23 @@
+class Backend::Forms::SubmissionsController < Backend::Forms::BaseController
+  include Concerns::PaginationController
+
+  before_action :find_model, except: [:index]
+  before_action -> do
+    breadcrumb.add t('b.forms'), backend_forms_path
+    breadcrumb.add @form.description, edit_backend_form_path(@form)
+  end
+
+  def index
+    @submissions = paginate(@form.submissions)
+  end
+
+  def destroy
+    @model.destroy
+    redirect_to backend_forms_path,
+                notice: translate_notice(:deleted, :form_submission)
+  end
+
+  def find_model
+    @model = FormSubmission.find(params[:id])
+  end
+end

data/app/controllers/backend/forms_controller.rb

@@ -0,0 +1,58 @@
+class Backend::FormsController < Backend::BaseController
+  include Concerns::Backend::TranslatableController
+
+  before_action :find_model, only: [:edit, :update, :destroy]
+  before_action -> { breadcrumb.add t('b.forms'), backend_forms_path}
+
+  def index
+    @forms = Form.all
+  end
+
+  def new
+    @model = Form.new
+  end
+
+  def create
+    @model = Form.new(allowed_params)
+
+    if @model.save
+      redirect_to backend_forms_path, notice: translate_notice(:added, :form)
+    else
+      render :new
+    end
+  end
+
+  def edit
+    @model = Form.find(params[:id])
+  end
+
+  def update
+    if @model.update_attributes allowed_params
+      redirect_to backend_forms_path, notice: translate_notice(:edited, :form)
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    @model.destroy
+    redirect_to backend_forms_path, notice: translate_notice(:deleted, :form)
+  end
+
+  private
+
+  def allowed_params
+    params[:form].permit(:identifier, :description)
+  end
+
+  def find_model
+    @model = Form.find(params[:id].to_i)
+  end
+
+  def translation_form
+    Backend::FormTranslationForm.new(
+      @model,
+      @model.translation(params[:translation_locale])
+    )
+  end
+end

data/app/decorators/form_decorator.rb

@@ -0,0 +1,7 @@
+class FormDecorator < ApplicationDecorator
+  delegate_all
+
+  def email_present?
+    data.select('DISTINCT name').map(&:name).include?('email')
+  end
+end

data/app/decorators/form_submission_data_decorator.rb

@@ -0,0 +1,9 @@
+class FormSubmissionDataDecorator < ApplicationDecorator
+  delegate_all
+
+  def label
+    field = form_submission.form.fields.find_by(identifier: name)
+    return field.label if field && field.label.present?
+    name
+  end
+end

data/app/forms/backend/form_field_translation_form.rb

@@ -0,0 +1,8 @@
+class Backend::FormFieldTranslationForm < Backend::TranslationForm
+  attribute :label, String
+  attribute :default_value, String
+
+  def self.model_name
+    FormField.model_name
+  end
+end

data/app/forms/backend/form_translation_form.rb

@@ -0,0 +1,7 @@
+class Backend::FormTranslationForm < Backend::TranslationForm
+  attribute :success_message, String
+
+  def self.model_name
+    Form.model_name
+  end
+end

data/app/helpers/link_helper.rb

@@ -1,33 +1,43 @@
 module LinkHelper
-  def link_to_show(object)
-    str = Udongo::ObjectPath.find(object)
-
+  def link_to_show(value)
     link_to(
       icon(:search),
-      send(str, *Udongo::ObjectPath.remove_symbols(object)),
+      path_from_string_or_object(value),
       title: t('b.view')
     )
   end
 
-  def link_to_edit(object)
-    str = "edit_#{Udongo::ObjectPath.find(object)}"
-
+  def link_to_edit(value)
     link_to(
       icon(:pencil_square_o),
-      send(str, *Udongo::ObjectPath.remove_symbols(object)),
+      path_from_string_or_object(value, 'edit_'),
       title: t('b.edit')
     )
   end
 
-  def link_to_delete(object)
-    str = Udongo::ObjectPath.find(object)
+  def link_to_edit_translation(object, locale = Udongo.config.i18n.app.default_locale)
+    str = "edit_translation_#{Udongo::ObjectPath.find(object)}"
+    url = send(str, *Udongo::ObjectPath.remove_symbols(object), locale)
+
+    link_to_edit(url)
+  end
 
+  def link_to_delete(value)
     link_to(
       icon(:trash),
-      send(str, *Udongo::ObjectPath.remove_symbols(object)),
+      path_from_string_or_object(value),
       method: :delete,
       data: { confirm: t('b.msg.confirm') },
       title: t('b.delete')
     )
   end
+
+  private
+
+  def path_from_string_or_object(value, prefix = nil)
+    return value if value.is_a?(String)
+
+    str = "#{prefix}#{Udongo::ObjectPath.find(value)}"
+    send(str, *Udongo::ObjectPath.remove_symbols(value))
+  end
 end

data/app/models/form.rb

@@ -0,0 +1,10 @@
+class Form < ApplicationRecord
+  include Concerns::Translatable
+  translatable_fields :success_message
+
+  has_many :fields, class_name: 'FormField', dependent: :destroy
+  has_many :submissions, class_name: 'FormSubmission', dependent: :destroy
+  has_many :data, through: :submissions
+
+  validates :description, presence: true
+end

data/app/models/form_field.rb

@@ -0,0 +1,13 @@
+class FormField < ApplicationRecord
+  include Concerns::Sortable
+  sortable scope: [:form_id]
+
+  include Concerns::Translatable
+  translatable_fields :label, :default_value
+
+  belongs_to :form
+
+  validates :form, :identifier, :field_type, presence: true
+
+  validates_uniqueness_of :identifier, scope: :form_id
+end

data/app/models/form_submission.rb

@@ -0,0 +1,19 @@
+class FormSubmission < ApplicationRecord
+  include Concerns::Emailable
+  include Concerns::Searchable
+
+  # TODO: Make this searchable by adding the key/value columns on data
+  # as accessible attributes on FormSubmission.
+
+  belongs_to :form
+  has_many :data, class_name: 'FormSubmissionData'
+
+  validates :form, presence: true
+
+  def data_object
+    data.inject(OpenStruct.new) do |stack, d|
+      stack.send("#{d.name}=", d.value)
+      stack
+    end
+  end
+end

data/app/models/form_submission_data.rb

@@ -0,0 +1,17 @@
+class FormSubmissionData < ApplicationRecord
+  # By saving the form submission data as a search index, you work around
+  # possible slow searches for the form submissions.
+  after_save do
+    next if value.blank?
+    index = form_submission.search_indices.find_or_initialize_by(
+      locale: Udongo.config.i18n.app.default_locale,
+      name: name
+    )
+    index.value = value
+    index.save!
+  end
+
+  belongs_to :form_submission
+
+  validates :form_submission, presence: true
+end

data/app/views/backend/articles/index.html.erb

@@ -41,7 +41,7 @@
           <td><%= t a.visible?.to_s %></td>
           <td><%= t a.press_release?.to_s %></td>
           <td class="text-xs-right">
-            <%= link_to_edit [:backend, a] %>
+            <%= link_to_edit_translation [:backend, a] %>
             <%= link_to_delete [:backend, a] %>
           </td>
         </tr>

data/app/views/backend/email_templates/index.html.erb

@@ -15,7 +15,7 @@
         <tr data-update-position="<%= update_position_backend_email_template_path(s) %>">
           <td><%= s.description %></td>
           <td class="text-xs-right">
-            <%= link_to_edit [:backend, s] %>
+            <%= link_to_edit_translation [:backend, s] %>
           </td>
         </tr>
       <% end %>

data/app/views/backend/forms/_fields.html.erb

@@ -0,0 +1,42 @@
+<% javascript 'backend/sortable' %>
+
+<div id="form-fields" class="card">
+  <div class="card-header">
+    <%= t 'b.msg.form_fields.index_header_html', form: form.description %>
+    <% if form.fields.any? %>
+      <div class="pull-right">
+        <%= link_to icon(:plus, t('b.msg.form_fields.add')), new_backend_form_field_path(form), class: 'btn btn-primary btn-sm' %>
+      </div>
+    <% end %>
+  </div>
+
+  <div class="card-block">
+    <% if form.fields.any? %>
+      <table class="table table-hover">
+        <thead>
+          <tr>
+            <th><%= t('b.name') %></th>
+            <th>&nbsp;</th>
+          </tr>
+        </thead>
+
+        <tbody>
+          <% form.fields.each do |f| %>
+            <tr data-update-position="<%= update_position_backend_form_field_path(form, f) %>">
+              <td><%= f.identifier %></td>
+              <td class="text-xs-right">
+                <%= link_to icon(:pencil_square_o), edit_backend_form_field_path(form, f) %>
+                <%= link_to icon(:trash), backend_form_field_path(form, f), method: :delete, data: { confirm: t('b.msg.confirm') }, title: t('b.delete') %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    <% else %>
+      <p>
+        <%= t('b.msg.form_fields.explanation') %>
+        <%= link_to t('b.msg.form_fields.add_first'), new_backend_form_field_path(form) %>.
+      </p>
+    <% end %>
+  </div>
+</div>

data/app/views/backend/forms/_form.html.erb

@@ -0,0 +1,24 @@
+<%= render 'backend/general_form_error', object: @model %>
+
+<%= simple_form_for [:backend, @model] do |f| %>
+  <div class="row">
+    <div class="col-md-12">
+      <div class="card">
+        <div class="card-header">
+          <%= t 'b.general' %>
+        </div>
+
+        <div class="card-block">
+          <%= f.input :description, as: :string %>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <% unless @model.new_record? %>
+    <%# TODO: rendered form preview instead of formfields datagrid %>
+    <%# render 'backend/forms/fields', form: @model %>
+  <% end %>
+
+  <%= render 'backend/form_actions', cancel_url: backend_forms_path %>
+<% end %>