udongo 5.8.0 → 5.9.0

data/config/locales/en_forms.yml

@@ -20,10 +20,12 @@ en:
         category: Category
         cc: CC
         content: Content
+        default_value: Default value
         description: Description
         disabled: Disabled
         email: E-mail
         extra: Extra
+        field_type: Field type
         first_name: First name
         html_content: HTML content
         identifier: Internal name
@@ -37,6 +39,7 @@ en:
         phone: Phone
         plain_content: Plain content
         press_release: Press release?
+        presence: Mandatory input
         published_at: Published at
         seo_title: Page title
         seo_slug: Custom URL

data/config/locales/nl_backend.yml

@@ -21,6 +21,7 @@ nl:
     down: Omlaag
     download: Download
     edit: Bewerk
+    edit_translation: Bewerk vertaling
     email: E-mail
     emails: E-mails
     email_template: E-mail template
@@ -32,6 +33,12 @@ nl:
     filter: Filter
     first_name: Voornaam
     flexible_content: Flexibele inhoud
+    form: Formulier
+    form_field: Invulveld
+    form_fields: Invulvelden
+    form_submission: Inzending
+    form_submissions: Inzendingen
+    forms: Formulieren
     from: Van
     general: Algemeen
     house_number: Huisnummer
@@ -51,6 +58,7 @@ nl:
     none: Geen
     not_set: Niet ingesteld
     not_yet_sent: Nog niet verzonden
+    overview: Overzicht
     page: Pagina
     pages: Pagina's
     password: Wachtwoord
@@ -86,6 +94,7 @@ nl:
     used: Gebruikt
     user: Gebruiker
     users: Gebruikers
+    validations: Validaties
     variables: Variabelen
     view: Bekijk
     visible: Zichtbaar
@@ -116,6 +125,22 @@ nl:
         explanation: Met deze module kan je flexibele, responsive inhoud toevoegen. Klik op onderstaande knop om een eerste rij toe te voegen.
         no_picture_present: Er werd nog geen foto geüpload of gelinkt.
       forgot_password: Wachtwoord vergeten?
+      form_fields:
+        add: Invulveld toevoegen
+        add_first: Maak het eerste invulveld aan
+        edit: Bewerk invulveld
+        explanation: Er zijn nog geen invulvelden gedefiniëerd voor dit formulier.
+        index_header_html: 'Invulvelden voor formulier “%{form}”'
+      form_submissions:
+        back_html: '← Terug naar de inzendingen'
+        explanation: Er zijn nog geen inzendingen binnengekomen voor dit formulier.
+        received_at: Ontvangen op
+      forms:
+        add_first: Maak het eerste formulier aan
+        back_html: '← Terug naar het overzicht van formulieren'
+        explanation: Met deze module kan je formulieren beheren en hun inzendingen bekijken.
+        removal_warning: 'Dit formulier kan niet verwijderd worden omdat er %{submissions} inzending(en) aan gekoppeld zijn.'
+        view_submissions: Inzendingen voor dit formulier
       general_form_error: Er trad een fout op. Controleer de gemarkeerde velden.
       help_texts:
         status_code: Meer info over het gebruik van status codes.

data/config/locales/nl_forms.yml

@@ -20,10 +20,12 @@ nl:
         category: Categorie
         cc: CC
         content: Inhoud
+        default_value: Standaardwaarde
         description: Beschrijving
         disabled: Uitgeschakeld
         email: E-mail
         extra: Extra
+        field_type: Veldtype
         first_name: Voornaam
         html_content: HTML inhoud
         identifier: Interne naam
@@ -37,6 +39,7 @@ nl:
         phone: Telefoonnummer
         plain_content: Tekstuele inhoud
         press_release: Persbericht?
+        presence: Verplicht veld
         published_at: Gepubliceerd op
         seo_title: Paginatitel
         seo_slug: Aangepaste URL
@@ -45,6 +48,7 @@ nl:
         seo_custom: Extra meta-tags
         subject: Onderwerp
         subtitle: Subtitel
+        success_message: Melding bij succesvolle verzending
         summary: Korte inhoud
         synonyms: Synoniemen
         title: Titel

data/config/routes.rb

@@ -32,6 +32,15 @@ Rails.application.routes.draw do
       end
     end
 
+    resources :forms do
+      concerns :translatable
+      resources :submissions, controller: 'forms/submissions', except: %w(new create)
+
+      resources :fields, controller: 'forms/fields', except: %w(show) do
+        concerns :translatable, :positionable
+      end
+    end
+
     resources :articles, except: [:show] do
       concerns :translatable
 

data/db/migrate/20170407115044_readd_forms.rb

@@ -0,0 +1,39 @@
+class ReaddForms < ActiveRecord::Migration[5.0]
+  def change
+    create_table :forms do |t|
+      t.text :locales
+      t.string :identifier
+      t.string :description
+
+      t.timestamps null: false
+    end
+    add_index :forms, :identifier
+
+
+    create_table :form_fields do |t|
+      t.references :form, index: true
+      t.text :locales
+      t.string :name
+      t.string :field_type
+      t.string :default_value
+      t.string :placeholder
+      t.integer :position
+      t.timestamps null: false
+    end
+
+
+    create_table :form_submissions do |t|
+      t.references :form, index: true
+      t.text :extra_info
+      t.timestamps null: false
+    end
+
+
+    create_table :form_submission_data, force: :cascade do |t|
+      t.references :form_submission, index: true
+      t.string :name
+      t.text :value
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20170410115600_rename_name_to_identifier_for_form_field.rb

@@ -0,0 +1,5 @@
+class RenameNameToIdentifierForFormField < ActiveRecord::Migration[5.0]
+  def change
+    rename_column :form_fields, :name, :identifier
+  end
+end

data/db/migrate/20170410120608_remove_placeholder_from_form_fields.rb

@@ -0,0 +1,5 @@
+class RemovePlaceholderFromFormFields < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :form_fields, :placeholder
+  end
+end

data/db/migrate/20170410121055_remove_default_value_from_form_fields.rb

@@ -0,0 +1,5 @@
+class RemoveDefaultValueFromFormFields < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :form_fields, :default_value
+  end
+end

data/db/migrate/20170411161008_add_validation_fields_to_form_fields.rb

@@ -0,0 +1,6 @@
+class AddValidationFieldsToFormFields < ActiveRecord::Migration[5.0]
+  def change
+    add_column :form_fields, :presence, :boolean, after: :field_type
+    add_column :form_fields, :email, :boolean, after: :presence
+  end
+end

data/lib/udongo/configs/forms.rb

@@ -0,0 +1,18 @@
+module Udongo
+  module Configs
+    class Forms
+      def initialize
+        @configs = {}
+      end
+
+      def method_missing(method, *args, &block)
+        unless @configs[method]
+          super unless ::Form.find_by(identifier: method)
+          @configs[method] = OpenStruct.new(datagrid_fields: [], filter_fields: [])
+        end
+
+        @configs[method]
+      end
+    end
+  end
+end

data/lib/udongo/pages/tree_node.rb

@@ -13,7 +13,7 @@ module Udongo::Pages
         li_attr: list_attributes,
         data: {
           id: @page.id,
-          url: @context.edit_backend_page_path(@page),
+          url: @context.edit_translation_backend_page_path(@page, Udongo.config.i18n.app.default_locale),
           delete_url: @context.backend_page_path(@page, format: :json),
           deletable: @page.deletable?,
           draggable: @page.draggable?,

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '5.8.0'
+  VERSION = '5.9.0'
 end

data/spec/factories/form_fields.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :form_field do
+    form
+    sequence(:identifier) { |n| "name-#{n}" }
+    field_type 'text'
+  end
+end

data/spec/factories/form_submission_data.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :form_submission_data do
+    form_submission
+    name 'foo'
+    value 'bar'
+  end
+end

data/spec/factories/form_submissions.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :form_submission do
+    form
+  end
+end

data/spec/factories/forms.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :form do
+    description 'Contact form'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 5.8.0
+  version: 5.9.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -466,6 +466,10 @@ files:
 - app/controllers/backend/dashboard_controller.rb
 - app/controllers/backend/email_templates_controller.rb
 - app/controllers/backend/emails_controller.rb
+- app/controllers/backend/forms/base_controller.rb
+- app/controllers/backend/forms/fields_controller.rb
+- app/controllers/backend/forms/submissions_controller.rb
+- app/controllers/backend/forms_controller.rb
 - app/controllers/backend/images_controller.rb
 - app/controllers/backend/navigation/items_controller.rb
 - app/controllers/backend/navigations_controller.rb
@@ -490,6 +494,8 @@ files:
 - app/decorators/content_picture_decorator.rb
 - app/decorators/content_row_decorator.rb
 - app/decorators/content_text_decorator.rb
+- app/decorators/form_decorator.rb
+- app/decorators/form_submission_data_decorator.rb
 - app/decorators/navigation_item_decorator.rb
 - app/decorators/page_decorator.rb
 - app/decorators/pagination_decorator.rb
@@ -497,6 +503,8 @@ files:
 - app/decorators/snippet_decorator.rb
 - app/forms/backend/article_translation_form.rb
 - app/forms/backend/email_template_translation_form.rb
+- app/forms/backend/form_field_translation_form.rb
+- app/forms/backend/form_translation_form.rb
 - app/forms/backend/navigation_item_translation_form.rb
 - app/forms/backend/page_translation_form.rb
 - app/forms/backend/snippet_translation_form.rb
@@ -556,6 +564,10 @@ files:
 - app/models/content_text.rb
 - app/models/email.rb
 - app/models/email_template.rb
+- app/models/form.rb
+- app/models/form_field.rb
+- app/models/form_submission.rb
+- app/models/form_submission_data.rb
 - app/models/image.rb
 - app/models/log.rb
 - app/models/meta.rb
@@ -625,6 +637,22 @@ files:
 - app/views/backend/email_templates/new.html.erb
 - app/views/backend/emails/index.html.erb
 - app/views/backend/emails/show.html.erb
+- app/views/backend/forms/_fields.html.erb
+- app/views/backend/forms/_form.html.erb
+- app/views/backend/forms/_tabs.html.erb
+- app/views/backend/forms/edit.html.erb
+- app/views/backend/forms/edit_translation.html.erb
+- app/views/backend/forms/fields/_form.html.erb
+- app/views/backend/forms/fields/_tabs.html.erb
+- app/views/backend/forms/fields/edit.html.erb
+- app/views/backend/forms/fields/edit_translation.html.erb
+- app/views/backend/forms/fields/index.html.erb
+- app/views/backend/forms/fields/new.html.erb
+- app/views/backend/forms/index.html.erb
+- app/views/backend/forms/new.html.erb
+- app/views/backend/forms/submissions/_form.html.erb
+- app/views/backend/forms/submissions/index.html.erb
+- app/views/backend/forms/submissions/show.html.erb
 - app/views/backend/images/_filter.html.erb
 - app/views/backend/images/index.html.erb
 - app/views/backend/images/new.html.erb
@@ -763,6 +791,11 @@ files:
 - db/migrate/20170228183831_create_images.rb
 - db/migrate/20170305125627_create_articles.rb
 - db/migrate/20170318184654_add_title_and_content_disabled_to_snippet.rb
+- db/migrate/20170407115044_readd_forms.rb
+- db/migrate/20170410115600_rename_name_to_identifier_for_form_field.rb
+- db/migrate/20170410120608_remove_placeholder_from_form_fields.rb
+- db/migrate/20170410121055_remove_default_value_from_form_fields.rb
+- db/migrate/20170411161008_add_validation_fields_to_form_fields.rb
 - db/migrate/20170412074304_create_content_pictures.rb
 - lib/tasks/task_extras.rb
 - lib/tasks/udongo_tasks.rake
@@ -777,6 +810,7 @@ files:
 - lib/udongo/configs/assets.rb
 - lib/udongo/configs/base.rb
 - lib/udongo/configs/flexible_content.rb
+- lib/udongo/configs/forms.rb
 - lib/udongo/configs/i18n.rb
 - lib/udongo/configs/i18ns/app.rb
 - lib/udongo/configs/i18ns/cms.rb
@@ -821,6 +855,10 @@ files:
 - spec/factories/content_texts.rb
 - spec/factories/email_templates.rb
 - spec/factories/emails.rb
+- spec/factories/form_fields.rb
+- spec/factories/form_submission_data.rb
+- spec/factories/form_submissions.rb
+- spec/factories/forms.rb
 - spec/factories/images.rb
 - spec/factories/logs.rb
 - spec/factories/meta.rb