udongo 2.0.4 → 3.0.0

data/app/assets/stylesheets/backend/udongo.scss

@@ -10,6 +10,7 @@
 @import 'components/breadcrumb';
 @import 'components/form';
 @import 'components/nav';
+@import 'components/page_tree';
 
 // Page specific styles
 @import 'pages/login';

data/app/controllers/backend/admins_controller.rb

@@ -1,4 +1,4 @@
-class Backend::AdminsController < BackendController
+class Backend::AdminsController < Backend::BaseController
   before_action :find_admin, only: [:show, :edit, :update, :destroy]
   before_action -> { breadcrumb.add t('b.admins'), backend_admins_path }
 
@@ -45,7 +45,7 @@ class Backend::AdminsController < BackendController
 
   def allowed_params
     params[:admin].permit(
-      :first_name, :last_name, :email, :password, :password_confirmation
+      :locale, :first_name, :last_name, :email, :password, :password_confirmation
     )
   end
 

data/app/controllers/{backend_controller.rb → backend/base_controller.rb}

@@ -1,8 +1,8 @@
-class BackendController < ActionController::Base
+class Backend::BaseController < ActionController::Base
   include Udongo::Cryptography
 
   layout 'backend/application'
-  before_action :check_login
+  before_action :interface_locale, :check_login
 
   def breadcrumb
     @breadcrumb ||= Udongo::Breadcrumb.new
@@ -18,13 +18,21 @@ class BackendController < ActionController::Base
     Udongo::Notification.new(notice).translate(actor)
   end
 
-  def default_locale
-    Udongo.config.i18n.default_locale
+  def default_app_locale
+    Udongo.config.i18n.app.default_locale
   end
-  helper_method :default_locale
+  helper_method :default_app_locale
 
   private
 
+  def interface_locale
+    if current_admin && current_admin.locale.present?
+      I18n.locale = current_admin.locale
+    else
+      I18n.locale = Udongo.config.i18n.cms.default_interface_locale
+    end
+  end
+
   def check_login
     unless current_admin
       session[:backend_redirect] = request.url

data/app/controllers/backend/content/rows/columns_controller.rb

@@ -1,4 +1,4 @@
-class Backend::Content::Rows::ColumnsController < BackendController
+class Backend::Content::Rows::ColumnsController < Backend::BaseController
   include Concerns::Backend::PositionableController
 
   before_action :find_row

data/app/controllers/backend/content/rows/images_controller.rb

@@ -1,4 +1,4 @@
-class Backend::Content::Rows::ImagesController < BackendController
+class Backend::Content::Rows::ImagesController < Backend::BaseController
   include Concerns::Backend::ContentTypeController
 
   model ContentImage

data/app/controllers/backend/content/rows/texts_controller.rb

@@ -1,4 +1,4 @@
-class Backend::Content::Rows::TextsController < BackendController
+class Backend::Content::Rows::TextsController < Backend::BaseController
   include Concerns::Backend::ContentTypeController
 
   model ContentText

data/app/controllers/backend/content/rows_controller.rb

@@ -1,4 +1,4 @@
-class Backend::Content::RowsController < BackendController
+class Backend::Content::RowsController < Backend::BaseController
   include Concerns::Backend::PositionableController
   before_action :find_model, only: [:update_position, :destroy]
 

data/app/controllers/backend/dashboard_controller.rb

@@ -1,2 +1,2 @@
-class Backend::DashboardController < BackendController
+class Backend::DashboardController < Backend::BaseController
 end

data/app/controllers/backend/email_templates_controller.rb

@@ -1,4 +1,4 @@
-class Backend::EmailTemplatesController < BackendController
+class Backend::EmailTemplatesController < Backend::BaseController
   include Concerns::Backend::TranslatableController
   include Concerns::Backend::PositionableController
 
@@ -10,27 +10,21 @@ class Backend::EmailTemplatesController < BackendController
   end
 
   def new
-    @form = Backend::EmailTemplateForm.new(EmailTemplate.new)
+    @model = EmailTemplate.new
   end
 
   def create
-    @form = Backend::EmailTemplateForm.new(EmailTemplate.new)
+    @model = EmailTemplate.new allowed_params
 
-    if @form.save params[:email_template]
-      redirect_to edit_translation_backend_email_template_path(@form.email_template, translation_locale: default_locale), notice: translate_notice(:added, :email_template)
+    if @model.save
+      redirect_to edit_translation_backend_email_template_path(@model, translation_locale: default_app_locale), notice: translate_notice(:added, :email_template)
     else
       render :new
     end
   end
 
-  def edit
-    @form = Backend::EmailTemplateForm.new(@model)
-  end
-
   def update
-    @form = Backend::EmailTemplateForm.new(@model)
-
-    if @form.save params[:email_template]
+    if @model.update_attributes allowed_params
       redirect_to edit_backend_email_template_path(@model), notice: translate_notice(:edited, :email_template)
     else
       render :edit
@@ -43,6 +37,12 @@ class Backend::EmailTemplatesController < BackendController
     @model = EmailTemplate.find params[:id]
   end
 
+  def allowed_params
+    params[:email_template].permit(
+      :identifier, :description, :from_name, :from_email, :cc, :bcc
+    )
+  end
+
   def translation_form
     Backend::EmailTemplateTranslationForm.new(
       @model, @model.translation(params[:translation_locale])

data/app/controllers/backend/emails_controller.rb

@@ -1,4 +1,4 @@
-class Backend::EmailsController < BackendController
+class Backend::EmailsController < Backend::BaseController
   include Concerns::PaginationController
 
   before_action -> { breadcrumb.add t('b.emails'), backend_emails_path }

data/app/controllers/backend/navigation/items_controller.rb

@@ -1,4 +1,4 @@
-class Backend::Navigation::ItemsController < BackendController
+class Backend::Navigation::ItemsController < Backend::BaseController
   include Concerns::Backend::TranslatableController
   include Concerns::Backend::PositionableController
 
@@ -7,27 +7,21 @@ class Backend::Navigation::ItemsController < BackendController
   before_action { breadcrumb.add t('b.navigation'), backend_navigations_path }
 
   def new
-    @form = Backend::NavigationItemForm.new(@navigation.items.new.decorate)
+    @model = @navigation.items.new.decorate
   end
 
   def create
-    @form = Backend::NavigationItemForm.new(@navigation.items.new.decorate)
+    @model = @navigation.items.new(allowed_params).decorate
 
-    if @form.save params[:navigation_item]
+    if @model.save
       redirect_to backend_navigations_path, notice: translate_notice(:added, :navigation_item)
     else
       render :new
     end
   end
 
-  def edit
-    @form = Backend::NavigationItemForm.new(@model)
-  end
-
   def update
-    @form = Backend::NavigationItemForm.new(@model)
-
-    if @form.save params[:navigation_item]
+    if @model.update_attributes allowed_params
       redirect_to backend_navigations_path, notice: translate_notice(:changes_saved)
     else
       render :edit
@@ -49,6 +43,10 @@ class Backend::Navigation::ItemsController < BackendController
     @model = NavigationItem.find(params[:id]).decorate
   end
 
+  def allowed_params
+    params[:navigation_item].permit(:page_id, :extra)
+  end
+
   def translation_form
     Backend::NavigationItemTranslationForm.new(
       @model, @model.translation(params[:translation_locale])

data/app/controllers/backend/navigations_controller.rb

@@ -1,4 +1,4 @@
-class Backend::NavigationsController < BackendController
+class Backend::NavigationsController < Backend::BaseController
   before_action -> { breadcrumb.add t('b.navigation'), backend_navigations_path }
 
   def index

data/app/controllers/backend/pages_controller.rb

@@ -1,7 +1,7 @@
-class Backend::PagesController < BackendController
+class Backend::PagesController < Backend::BaseController
   include Concerns::Backend::TranslatableController
 
-  before_action :find_model, only: [:edit, :update, :tree_drag_and_drop, :destroy]
+  before_action :find_model, except: [:index, :new, :create]
   before_action -> { breadcrumb.add t('b.pages'), backend_pages_path }
 
   def index
@@ -10,39 +10,38 @@ class Backend::PagesController < BackendController
     respond_to do |format|
       format.html
       format.json {
-        render json: page_tree_data.to_json
+        render json: Udongo::Pages::Tree.new(self).data
       }
     end
   end
 
   def new
-    @form = Backend::PageForm.new(Page.new.decorate)
+    @model = Page.new.decorate
   end
 
   def create
-    @form = Backend::PageForm.new(Page.new.decorate)
+    @model = Page.new(allowed_params).decorate
 
-    if @form.save params[:page]
-      redirect_to edit_backend_page_path(@form.page), notice: translate_notice(:added, :page)
+    if @model.save
+      redirect_to edit_backend_page_path(@model), notice: translate_notice(:added, :page)
     else
       render :new
     end
   end
 
-  def edit
-    @form = Backend::PageForm.new(@model)
-  end
-
   def update
-    @form = Backend::PageForm.new(@model)
-
-    if @form.save params[:page]
+    if @model.update_attributes allowed_params
       redirect_to edit_backend_page_path(@model), notice: translate_notice(:edited, :page)
     else
       render :edit
     end
   end
 
+  def toggle_visibility
+    @model.visible? ? @model.hide! : @model.show!
+    render json: { toggled: @model }
+  end
+
   def tree_drag_and_drop
     # TODO (Dave) - check if this page is draggable.
     render json: { moved: @model.set_position(params[:position], params[:parent_id]) }
@@ -53,20 +52,16 @@ class Backend::PagesController < BackendController
     render json: { trashed: @model.destroy }
   end
 
-  def page_tree_data(parent_id: nil)
-    Page.where(parent_id: parent_id).inject([]) do |data, p|
-      hash = node_data p
-      hash[:children] = page_tree_data(parent_id: p.id) if p.children.any?
-      data << hash
-    end
-  end
-
   private
 
   def find_model
     @model = Page.find(params[:id]).decorate
   end
 
+  def allowed_params
+    params[:page].permit(:description, :parent_id, :visible)
+  end
+
   def translation_form
     Backend::PageTranslationForm.new(
       @model,
@@ -74,21 +69,4 @@ class Backend::PagesController < BackendController
       @model.seo(params[:translation_locale])
     )
   end
-
-  def node_data(page)
-    {
-      text: page.description,
-      type: :file,
-      state: { selected: false },
-      data: {
-        id: page.id,
-        url: edit_backend_page_path(page),
-        delete_url: backend_page_path(page, format: :json),
-        deletable: page.deletable?,
-        draggable: page.draggable?,
-        update_position_url: tree_drag_and_drop_backend_page_path(page)
-      },
-      children: []
-    }
-  end
 end

data/app/controllers/backend/redirects_controller.rb

@@ -1,4 +1,4 @@
-class Backend::RedirectsController < BackendController
+class Backend::RedirectsController < Backend::BaseController
   include Concerns::PaginationController
 
   before_action -> { breadcrumb.add t('b.redirects'), backend_redirects_path }

data/app/controllers/backend/seo_controller.rb

@@ -1,4 +1,4 @@
-class Backend::SeoController < BackendController
+class Backend::SeoController < Backend::BaseController
   def slugify
     result = params[:value] ? params[:value].parameterize : nil
     render json: { result: result }

data/app/controllers/backend/sessions_controller.rb

@@ -1,4 +1,4 @@
-class Backend::SessionsController < BackendController
+class Backend::SessionsController < Backend::BaseController
   skip_before_action :check_login
   layout 'backend/login'
 

data/app/controllers/backend/snippets_controller.rb

@@ -1,4 +1,4 @@
-class Backend::SnippetsController < BackendController
+class Backend::SnippetsController < Backend::BaseController
   include Concerns::Backend::TranslatableController
 
   before_action :find_model, only: [:edit, :update]
@@ -9,28 +9,22 @@ class Backend::SnippetsController < BackendController
   end
 
   def new
-    @form = Backend::SnippetForm.new(Snippet.new)
+    @model = Snippet.new
   end
 
   def create
-    @form = Backend::SnippetForm.new(Snippet.new)
+    @model = Snippet.new allowed_params
 
-    if @form.save params[:snippet]
-      redirect_to edit_translation_backend_snippet_path(@form.snippet, translation_locale: default_locale),
+    if @model.save
+      redirect_to edit_translation_backend_snippet_path(@model, translation_locale: default_app_locale),
                   notice: translate_notice(:added, :snippet)
     else
       render :new
     end
   end
 
-  def edit
-    @form = Backend::SnippetForm.new(@model)
-  end
-
   def update
-    @form = Backend::SnippetForm.new(@model)
-
-    if @form.save params[:snippet]
+    if @model.update_attributes allowed_params
       redirect_to edit_backend_snippet_path(@model),
                   notice: translate_notice(:edited, :snippet)
     else
@@ -44,7 +38,14 @@ class Backend::SnippetsController < BackendController
     @model = Snippet.find params[:id]
   end
 
+  def allowed_params
+    params[:snippet].permit(:identifier, :description)
+  end
+
   def translation_form
-    Backend::SnippetTranslationForm.new(@model, @model.translation(params[:translation_locale]))
+    Backend::SnippetTranslationForm.new(
+      @model,
+      @model.translation(params[:translation_locale])
+    )
   end
 end

data/app/controllers/backend/tagbox_controller.rb

@@ -1,4 +1,4 @@
-class Backend::TagboxController < BackendController
+class Backend::TagboxController < Backend::BaseController
   def index
     tags = Tag.by_locale(locale).pluck(:name).map do |name|
       { label: name, value: name }

data/app/controllers/catch_all_controller.rb

@@ -6,7 +6,7 @@ class CatchAllController < ActionController::Base
       redirect.used!
       redirect_to redirect.destination_uri, status: redirect.status_code
     else
-      render text: 'Page not found', status: 404
+      render plain: 'Page not found', status: 404
     end
   end
 end

data/app/controllers/concerns/backend/content_type_controller.rb

@@ -28,7 +28,9 @@ module Concerns
       def content_path
         column = @model.column
         path = "edit_translation_backend_#{column.row.rowable.class.to_s.downcase}_path"
-        send(path, column.row.rowable, locale, anchor: "content-row-#{column.row.id}")
+        # TODO this needs to be the locale that you were editing, not the interface locale.
+        # You can reproduce this by editing flexible content in NL when your interface is english.
+        send(path, column.row.rowable, @model.column.row.locale, anchor: "content-row-#{column.row.id}")
       end
 
       def update

data/app/controllers/redirects_controller.rb

@@ -6,7 +6,7 @@ class RedirectsController < ActionController::Base
       redirect.used!
       redirect_to redirect.destination_uri, status: redirect.status_code
     else
-      render text: 'No such redirect or disabled.', status: 404
+      render plain: 'No such redirect or disabled.', status: 404
     end
   end
 

data/app/decorators/page_decorator.rb

@@ -21,9 +21,6 @@ class PageDecorator < ApplicationDecorator
       end
     end
 
-    str = ''
-    str << "/#{locale}" if Udongo.config.routes.prefix_with_locale?
-    str << "/#{slugs.reverse.join('/')}"
-    str
+    "/#{locale}/#{slugs.reverse.join('/')}"
   end
 end