From 85cd87fd8f331c396a746a7dbb1f123e7900e602 Mon Sep 17 00:00:00 2001 From: Praffesor Date: Tue, 20 Feb 2018 18:28:25 +0200 Subject: [PATCH 001/114] added title option, fixed images without light resizer, small sequel fixes --- app/assets/javascripts/form/form-ajax.coffee | 2 +- .../rademade_admin/abstract_controller.rb | 11 +++++--- app/helpers/rademade_admin/form_helper.rb | 7 +++-- app/models/rademade_admin/ability.rb | 26 ------------------- app/services/login.rb | 3 +-- app/services/saver.rb | 12 ++++++--- app/services/upload/preview/file.rb | 10 ++++--- .../rademade_admin/_blocks/_form.html.erb | 7 +++-- .../rademade_admin/_blocks/_list.html.erb | 8 +++--- .../_blocks/_navigation.html.erb | 6 +++-- .../_blocks/_pagination.html.erb | 2 +- .../_blocks/button/_save_and_return.html.erb | 5 ++-- .../_blocks/table/_head.html.erb | 2 +- .../rademade_admin/dashboard/index.html.erb | 10 ++++--- config/locales/rademade_admin.en.yml | 4 +-- .../model/adapter/query/sequel.rb | 2 +- lib/rademade_admin/model/configuration.rb | 13 ++++++++-- lib/rademade_admin/model/info.rb | 12 ++++++++- lib/rademade_admin/model/info/uploader.rb | 9 ++++++- 19 files changed, 88 insertions(+), 63 deletions(-) diff --git a/app/assets/javascripts/form/form-ajax.coffee b/app/assets/javascripts/form/form-ajax.coffee index 98824083..b0636b74 100644 --- a/app/assets/javascripts/form/form-ajax.coffee +++ b/app/assets/javascripts/form/form-ajax.coffee @@ -4,7 +4,7 @@ class @FormAjax extends Backbone.View @_prepareForAjax() $.ajax( url : @$el.attr('action') - type : @$el.attr('method') + type : @$el.data('method') data : @_getData() dataType : 'json' ).done(@_onDone).fail(@_onFail).always(@_onAlways) diff --git a/app/controllers/rademade_admin/abstract_controller.rb b/app/controllers/rademade_admin/abstract_controller.rb index 6e5939ed..a4af29b1 100644 --- a/app/controllers/rademade_admin/abstract_controller.rb +++ b/app/controllers/rademade_admin/abstract_controller.rb @@ -6,6 +6,8 @@ class AbstractController < ApplicationController layout 'rademade_admin' + protect_from_forgery prepend: true + before_action :init_user, :init_template_service, :require_login attr_reader :current_user @@ -21,7 +23,10 @@ def require_login end def init_user - @current_user = RademadeAdmin.configuration.admin_class.find(session[:user_id]) if session[:user_id].present? + if session[:user_id].present? + related_info = RademadeAdmin::Model::Graph.instance.model_info(RademadeAdmin.configuration.admin_class) + @current_user = related_info.query_adapter.find(session[:user_id]) + end end def init_template_service @@ -36,7 +41,7 @@ def render_errors(errors) end def admin_logged_in? - @current_user.is_a? RademadeAdmin.configuration.admin_class and @current_user.admin? + @current_user && @current_user.admin? end def current_ability @@ -44,4 +49,4 @@ def current_ability end end -end \ No newline at end of file +end diff --git a/app/helpers/rademade_admin/form_helper.rb b/app/helpers/rademade_admin/form_helper.rb index 18408abb..e36bd72c 100644 --- a/app/helpers/rademade_admin/form_helper.rb +++ b/app/helpers/rademade_admin/form_helper.rb @@ -45,7 +45,10 @@ def admin_form_options(record, model_info) :url => url, :method => method, :as => :data, - :html => admin_form_html_attributes(form_class) + :html => admin_form_html_attributes(form_class), + :data => { + :method => method + } } end @@ -111,4 +114,4 @@ def can_read_relation(data_item) !data_item.has_relation? || can?(:read, data_item.relation.to) end -end \ No newline at end of file +end diff --git a/app/models/rademade_admin/ability.rb b/app/models/rademade_admin/ability.rb index 4cad4930..bd725092 100644 --- a/app/models/rademade_admin/ability.rb +++ b/app/models/rademade_admin/ability.rb @@ -7,32 +7,6 @@ def initialize(user) if user.try(:admin?) can :manage, :all end - # Define abilities for the passed in user here. For example: - # - # user ||= User.new # guest user (not logged in) - # if user.admin? - # can :manage, :all - # else - # can :read, :all - # end - # - # The first argument to `can` is the action you are giving the user - # permission to do. - # If you pass :manage it will apply to every action. Other common actions - # here are :read, :create, :update and :destroy. - # - # The second argument is the resource the user can perform the action on. - # If you pass :all it will apply to every resource. Otherwise pass a Ruby - # class of the resource. - # - # The third argument is an optional hash of conditions to further filter the - # objects. - # For example, here the user can only update published articles. - # - # can :update, Article, :published => true - # - # See the wiki for details: - # https://github.com/ryanb/cancan/wiki/Defining-Abilities end end diff --git a/app/services/login.rb b/app/services/login.rb index bae29744..4346cf6d 100644 --- a/app/services/login.rb +++ b/app/services/login.rb @@ -6,9 +6,8 @@ def self.admin(params) params.require(:data).permit([:email, :password]) user = RademadeAdmin.configuration.admin_class.get_by_email(params[:data][:email]) - error(I18n.t('rademade_admin.login.validation.email_not_found'), :email) unless user.is_a? RademadeAdmin.configuration.admin_class + error(I18n.t('rademade_admin.login.validation.email_not_found'), :email) if user.nil? error(I18n.t('rademade_admin.login.validation.incorrect_password'), :password) unless user.valid_password? params[:data][:password] - error(I18n.t('rademade_admin.login.validation.access_denied'), :email) unless user.admin? user end diff --git a/app/services/saver.rb b/app/services/saver.rb index 21b1f917..edef419d 100644 --- a/app/services/saver.rb +++ b/app/services/saver.rb @@ -82,8 +82,12 @@ def save_model_upload(data_item, image_path) if image_path.blank? item.instance_exec(&data_item.uploader.remove_proc) else - full_image_path = data_item.uploader.full_path_for(image_path) - data_item.set_data(entity, File.open(full_image_path)) + if image_path.match /^http/ # is full path already + item.instance_exec(&data_item.uploader.remote_url_setter_proc(image_path)) + else + full_image_path = data_item.uploader.full_path_for(image_path) + data_item.set_data(entity, File.open(full_image_path)) + end end rescue # rm_todo clear image @@ -99,7 +103,7 @@ def find_entities(data_item, ids) end def simple_field_params - @params.require(:data).symbolize_keys.slice(*@model_info.data_items.save_form_fields) + @params.require(:data).slice(*@model_info.data_items.save_form_fields) end def related_entities(data_item, ids) @@ -107,4 +111,4 @@ def related_entities(data_item, ids) end end -end \ No newline at end of file +end diff --git a/app/services/upload/preview/file.rb b/app/services/upload/preview/file.rb index 2af3be2f..39fe08bb 100644 --- a/app/services/upload/preview/file.rb +++ b/app/services/upload/preview/file.rb @@ -35,13 +35,17 @@ def crop? end def image_preview - @uploader.resize_with_crop(300, 300) + if image? + @uploader.resize_with_crop(300, 300) + else + @uploader.url + end end protected def uploaded_preview_html - if image? + if image? || @uploader.file.content_type.match(/image\//) image_preview_html elsif video? video_preview_html @@ -87,4 +91,4 @@ def remove_ico_html end end end -end \ No newline at end of file +end diff --git a/app/views/rademade_admin/_blocks/_form.html.erb b/app/views/rademade_admin/_blocks/_form.html.erb index 10add560..ff4860dc 100644 --- a/app/views/rademade_admin/_blocks/_form.html.erb +++ b/app/views/rademade_admin/_blocks/_form.html.erb @@ -29,8 +29,11 @@ end if @model_info.persistence_adapter.new?(@item) content_header = t('rademade_admin.title.new_record', :model => @model_info.item_name) else - content_header = t('rademade_admin.title.edit_record', :model => @model_info.item_name, :record => @item) + content_header = t('rademade_admin.title.edit_record', { + :model => @model_info.item_name, + :record => @model_info.title_of(@item) + }) end concat render :template => @template_service.content_item_layout, :locals => { :content_header => content_header -} %> \ No newline at end of file +} %> diff --git a/app/views/rademade_admin/_blocks/_list.html.erb b/app/views/rademade_admin/_blocks/_list.html.erb index f897f715..64f2ec78 100644 --- a/app/views/rademade_admin/_blocks/_list.html.erb +++ b/app/views/rademade_admin/_blocks/_list.html.erb @@ -14,7 +14,7 @@ end %> <% content_for :content do %>
<%= yield(:nav_buttons) %>
<% - concat render @template_service.search_block + # concat render @template_service.search_block %>
<% @@ -23,11 +23,11 @@ end %> %>
<% - concat render @template_service.pagination_block - concat render @template_service.on_page_switcher_block + # concat render @template_service.pagination_block + # concat render @template_service.on_page_switcher_block %>
<% end concat render :template => @template_service.content_item_layout, :locals => { :content_header => @model_info.item_name -} %> \ No newline at end of file +} %> diff --git a/app/views/rademade_admin/_blocks/_navigation.html.erb b/app/views/rademade_admin/_blocks/_navigation.html.erb index 8bc5295c..5a77bb3f 100644 --- a/app/views/rademade_admin/_blocks/_navigation.html.erb +++ b/app/views/rademade_admin/_blocks/_navigation.html.erb @@ -1,4 +1,6 @@ -
+<% +user_model_info = RademadeAdmin::Model::Graph.instance.model_info(RademadeAdmin.configuration.admin_class) +%>
  • @@ -8,7 +10,7 @@
    - <%= @current_user %><% + <%= user_model_info.title_of(@current_user) %><% concat link_to '', rademade_admin_route(:logout_sessions_url), { :class => 'user-settings' } diff --git a/app/views/rademade_admin/_blocks/_pagination.html.erb b/app/views/rademade_admin/_blocks/_pagination.html.erb index ffe80a3b..8e83b88b 100644 --- a/app/views/rademade_admin/_blocks/_pagination.html.erb +++ b/app/views/rademade_admin/_blocks/_pagination.html.erb @@ -1 +1 @@ -<%= paginate @items, :theme => :rademade, :params => { :admin_params => {} } %> \ No newline at end of file +<%= paginate @items, :theme => :rademade, :params => { :admin_params => {} } %> diff --git a/app/views/rademade_admin/_blocks/button/_save_and_return.html.erb b/app/views/rademade_admin/_blocks/button/_save_and_return.html.erb index 084443d4..a10174f3 100644 --- a/app/views/rademade_admin/_blocks/button/_save_and_return.html.erb +++ b/app/views/rademade_admin/_blocks/button/_save_and_return.html.erb @@ -1,7 +1,8 @@ <% if @with_save_and_return_button translate_name = @model_info.persistence_adapter.new?(f.object) ? 'helpers.submit.create' : 'helpers.submit.update' - save_text = t(translate_name, :model => f.object.class.to_s) + save_text = t(translate_name, :model => @model_info.item_name) submit_button_text = t('rademade_admin.button.save_and_return', :save => save_text) concat f.submit submit_button_text, :class => 'btn-link is-blue', :name => 'save_and_return' -end %> \ No newline at end of file +end +%> diff --git a/app/views/rademade_admin/_blocks/table/_head.html.erb b/app/views/rademade_admin/_blocks/table/_head.html.erb index 404317b0..6967015e 100644 --- a/app/views/rademade_admin/_blocks/table/_head.html.erb +++ b/app/views/rademade_admin/_blocks/table/_head.html.erb @@ -33,4 +33,4 @@ end %> - \ No newline at end of file + diff --git a/app/views/rademade_admin/dashboard/index.html.erb b/app/views/rademade_admin/dashboard/index.html.erb index 8851f2dc..5574be90 100644 --- a/app/views/rademade_admin/dashboard/index.html.erb +++ b/app/views/rademade_admin/dashboard/index.html.erb @@ -1,3 +1,7 @@ -
    -

    <%= t('rademade_admin.dashboard.greeting', :user => @current_user) %>

    -
    \ No newline at end of file +<% +user_model_info = RademadeAdmin::Model::Graph.instance.model_info(RademadeAdmin.configuration.admin_class) +%>
    +

    + <%= t('rademade_admin.dashboard.greeting', :user_name => user_model_info.title_of(@current_user)) %> +

    +
    diff --git a/config/locales/rademade_admin.en.yml b/config/locales/rademade_admin.en.yml index d8d6da0e..9683c7f2 100644 --- a/config/locales/rademade_admin.en.yml +++ b/config/locales/rademade_admin.en.yml @@ -20,7 +20,7 @@ en: incorrect_password: "Incorrect password" access_denied: "Access denied" dashboard: - greeting: "Hello, %{user}" + greeting: "Hello, %{user_name}" record: new: "Add record" edit: "Edit" @@ -61,4 +61,4 @@ en: add: "Add new" edit: "Edit" destroy: "Destroy" - search: "Enter search phrase" \ No newline at end of file + search: "Enter search phrase" diff --git a/lib/rademade_admin/model/adapter/query/sequel.rb b/lib/rademade_admin/model/adapter/query/sequel.rb index f1139364..df4b2368 100644 --- a/lib/rademade_admin/model/adapter/query/sequel.rb +++ b/lib/rademade_admin/model/adapter/query/sequel.rb @@ -36,4 +36,4 @@ def paginate(page_condition, per_page_condition) end end end -end \ No newline at end of file +end diff --git a/lib/rademade_admin/model/configuration.rb b/lib/rademade_admin/model/configuration.rb index 5b46cac6..c4a3feac 100644 --- a/lib/rademade_admin/model/configuration.rb +++ b/lib/rademade_admin/model/configuration.rb @@ -3,7 +3,8 @@ module RademadeAdmin module Model class Configuration - attr_reader :controller, :parent_menu_item, :fixed_thead_value, :model_name, :menu_count_block, :preview_url_block + attr_reader :controller, :parent_menu_item, :fixed_thead_value, :model_name, + :menu_count_block, :preview_url_block, :title_field, :title_block def initialize(controller) @controller = controller @@ -73,6 +74,14 @@ def preview_url(&block) @preview_url_block = block end + def title(value = nil, &block) + if block_given? + @title_block = block + else + @title_field = value + end + end + private def name(item_name) @@ -105,4 +114,4 @@ def form(*field_options, &block) end end -end \ No newline at end of file +end diff --git a/lib/rademade_admin/model/info.rb b/lib/rademade_admin/model/info.rb index b3054b7d..40e3e4c3 100644 --- a/lib/rademade_admin/model/info.rb +++ b/lib/rademade_admin/model/info.rb @@ -100,6 +100,16 @@ def label_for(name) @model_configuration.field_labels.label_for(name) end + def title_of(item) + if @model_configuration.title_field + item.public_send(@model_configuration.title_field) + elsif @model_configuration.title_block + @model_configuration.title_block.call(item) + else + item.to_s + end + end + protected def _data_adapter @@ -120,4 +130,4 @@ def uploaders end end -end \ No newline at end of file +end diff --git a/lib/rademade_admin/model/info/uploader.rb b/lib/rademade_admin/model/info/uploader.rb index 3604b38f..d89f7bdb 100644 --- a/lib/rademade_admin/model/info/uploader.rb +++ b/lib/rademade_admin/model/info/uploader.rb @@ -17,6 +17,13 @@ def remove_proc end end + def remote_url_setter_proc(remote_url) + method_name = :"remote_#{name}_url=" + Proc.new do + self.send(method_name, remote_url) + end + end + def full_path_for(image_path) "#{CarrierWave.root}#{image_path}" end @@ -24,4 +31,4 @@ def full_path_for(image_path) end end end -end \ No newline at end of file +end From 3085735587c35a20dbc49a4360267db198fc6e37 Mon Sep 17 00:00:00 2001 From: Praffesor Date: Thu, 22 Feb 2018 11:04:50 +0200 Subject: [PATCH 002/114] fixed template service --- app/services/model_controller/templates.rb | 13 +++++-------- .../rademade_admin/_blocks/button/_edit.html.erb | 4 ++-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/app/services/model_controller/templates.rb b/app/services/model_controller/templates.rb index 3c15bce3..044f8ca4 100644 --- a/app/services/model_controller/templates.rb +++ b/app/services/model_controller/templates.rb @@ -3,10 +3,8 @@ module RademadeAdmin module Templates def native_template_folder - # 15 = "RademadeAdmin::".length - # 11 = "Controller".length - # e.g. RademadeAdmin::QuestionAnswer::UsersController to "question_answer/users" - @native_template_folder ||= self.class.to_s[15..-11].underscore + # e.g. RademadeAdmin::QuestionAnswer::UsersController to "rademade_admin/question_answer/users" + @native_template_folder ||= self.class.to_s.gsub('Controller', '').underscore end def form_template_path(real = false) @@ -15,12 +13,11 @@ def form_template_path(real = false) def abstract_template(template) # TODO make with rails native controller extending - if template_exists?(template, @template_service.template_path(native_template_folder)) - folder = native_template_folder + if template_exists?(template, native_template_folder) + "#{native_template_folder}/#{template}" else - folder = 'abstract' + @template_service.template_path('abstract', template) end - @template_service.template_path(folder, template) end end diff --git a/app/views/rademade_admin/_blocks/button/_edit.html.erb b/app/views/rademade_admin/_blocks/button/_edit.html.erb index 21bde740..17881264 100644 --- a/app/views/rademade_admin/_blocks/button/_edit.html.erb +++ b/app/views/rademade_admin/_blocks/button/_edit.html.erb @@ -1,5 +1,5 @@ <% -if can? :read, @model +if can? :read, item edit_url = admin_edit_uri(item) unless edit_url.nil? %> @@ -8,4 +8,4 @@ if can? :read, @model <% end -end %> \ No newline at end of file +end %> From 4d81e3ccdd0ee26da645be94cb0eed94749b4ec1 Mon Sep 17 00:00:00 2001 From: Praffesor Date: Thu, 22 Feb 2018 15:06:02 +0200 Subject: [PATCH 003/114] reverted error --- app/services/login.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/services/login.rb b/app/services/login.rb index 4346cf6d..ea6b6518 100644 --- a/app/services/login.rb +++ b/app/services/login.rb @@ -8,6 +8,7 @@ def self.admin(params) error(I18n.t('rademade_admin.login.validation.email_not_found'), :email) if user.nil? error(I18n.t('rademade_admin.login.validation.incorrect_password'), :password) unless user.valid_password? params[:data][:password] + error(I18n.t('rademade_admin.login.validation.access_denied'), :email) unless user.admin? user end From dc313c9d04d6249e2173d85d63b6f13e7e314592 Mon Sep 17 00:00:00 2001 From: Praffesor Date: Thu, 22 Feb 2018 15:50:07 +0200 Subject: [PATCH 004/114] fixed bug with other forms --- app/assets/javascripts/form/form-ajax.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/form/form-ajax.coffee b/app/assets/javascripts/form/form-ajax.coffee index b0636b74..5c70249c 100644 --- a/app/assets/javascripts/form/form-ajax.coffee +++ b/app/assets/javascripts/form/form-ajax.coffee @@ -4,7 +4,7 @@ class @FormAjax extends Backbone.View @_prepareForAjax() $.ajax( url : @$el.attr('action') - type : @$el.data('method') + type : @$el.data('method') || @$el.attr('method') data : @_getData() dataType : 'json' ).done(@_onDone).fail(@_onFail).always(@_onAlways) From 85e63c8cd53b0d1160484bd0775ccfaa2a364c39 Mon Sep 17 00:00:00 2001 From: Praffesor Date: Tue, 27 Feb 2018 11:49:38 +0200 Subject: [PATCH 005/114] updated url host options --- app/helpers/rademade_admin/uri_helper.rb | 2 -- config/initializers/kaminari_route_proxy.rb | 4 ++-- lib/rademade_admin/engine.rb | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/helpers/rademade_admin/uri_helper.rb b/app/helpers/rademade_admin/uri_helper.rb index 93cea555..88ad5f5e 100644 --- a/app/helpers/rademade_admin/uri_helper.rb +++ b/app/helpers/rademade_admin/uri_helper.rb @@ -6,7 +6,6 @@ def root_uri end def rademade_admin_route(route_url, opts = {}) - opts[:only_path] = true RademadeAdmin::Engine.routes.url_helpers.send(route_url, opts) end @@ -65,7 +64,6 @@ def admin_model_url_for(model, opts = {}) end def admin_url_for(opts) - opts[:only_path] = true Rails.application.routes.url_helpers.url_for(opts) rescue RademadeAdmin::Engine.routes.url_helpers.url_for(opts) rescue nil diff --git a/config/initializers/kaminari_route_proxy.rb b/config/initializers/kaminari_route_proxy.rb index e8a03d62..f6412127 100644 --- a/config/initializers/kaminari_route_proxy.rb +++ b/config/initializers/kaminari_route_proxy.rb @@ -3,7 +3,7 @@ module Helpers class Tag def page_url_for(page) admin_params = @params.extract!(:admin_params) - params = @params.merge(@param_name => (page <= 1 ? nil : page), :only_path => true) + params = @params.merge(@param_name => (page <= 1 ? nil : page)) if admin_params.empty? @template.url_for params else @@ -13,4 +13,4 @@ def page_url_for(page) end end end -end \ No newline at end of file +end diff --git a/lib/rademade_admin/engine.rb b/lib/rademade_admin/engine.rb index 1f9a5222..5547fb88 100644 --- a/lib/rademade_admin/engine.rb +++ b/lib/rademade_admin/engine.rb @@ -43,5 +43,7 @@ class Engine < ::Rails::Engine Dir[path].each { |f| require f } end + config.action_controller.default_url_options = RademadeAdmin::Engine.routes.default_url_options + end end From a7fe0570ee94dac37bbeca8db9c58c44b45df64b Mon Sep 17 00:00:00 2001 From: Praffesor Date: Tue, 27 Feb 2018 12:07:26 +0200 Subject: [PATCH 006/114] another possible route fix --- app/controllers/rademade_admin/abstract_controller.rb | 4 ++++ lib/rademade_admin/engine.rb | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/rademade_admin/abstract_controller.rb b/app/controllers/rademade_admin/abstract_controller.rb index a4af29b1..c4ea10fd 100644 --- a/app/controllers/rademade_admin/abstract_controller.rb +++ b/app/controllers/rademade_admin/abstract_controller.rb @@ -48,5 +48,9 @@ def current_ability @current_ability ||= RademadeAdmin.configuration.ability_class.new(@current_user) end + def default_url_options + RademadeAdmin::Engine.routes.default_url_options + end + end end diff --git a/lib/rademade_admin/engine.rb b/lib/rademade_admin/engine.rb index 5547fb88..1f9a5222 100644 --- a/lib/rademade_admin/engine.rb +++ b/lib/rademade_admin/engine.rb @@ -43,7 +43,5 @@ class Engine < ::Rails::Engine Dir[path].each { |f| require f } end - config.action_controller.default_url_options = RademadeAdmin::Engine.routes.default_url_options - end end From 03ed63f45c69ac1f3d3c8ca2e623b9a2e40d50d4 Mon Sep 17 00:00:00 2001 From: Praffesor Date: Wed, 25 Jul 2018 18:17:16 +0300 Subject: [PATCH 007/114] fixed header without url --- app/assets/javascripts/app/content/view.coffee | 13 ++++++++----- app/assets/javascripts/form/form.coffee | 2 +- app/views/rademade_admin/_blocks/_form.html.erb | 12 ++++++++---- app/views/rademade_admin/_blocks/_list.html.erb | 6 +++--- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/app/content/view.coffee b/app/assets/javascripts/app/content/view.coffee index cf984339..5e477df0 100644 --- a/app/assets/javascripts/app/content/view.coffee +++ b/app/assets/javascripts/app/content/view.coffee @@ -21,11 +21,14 @@ class @Content extends Backbone.View @moveToContentItem $('[data-content-item]:nth-last-child(2)') moveToContentItem : ($contentItem) -> - return if $contentItem.is(':last-child') - $contentItem.nextAll('[data-content-item]').remove() - if $contentItem.is(':first-child') - @renderItemFromUrl $contentItem.data('contentItem'), () -> - $contentItem.remove() + if $contentItem.length is 0 + window.history.back() if window.history.length > 2 + else + return if $contentItem.is(':last-child') + $contentItem.nextAll('[data-content-item]').remove() + if $contentItem.is(':first-child') + @renderItemFromUrl $contentItem.data('contentItem'), () -> + $contentItem.remove() bindClick : ($el) -> $el.find('[data-content-header]').bind 'click', (e) => diff --git a/app/assets/javascripts/form/form.coffee b/app/assets/javascripts/form/form.coffee index de91e662..1a1c35bd 100644 --- a/app/assets/javascripts/form/form.coffee +++ b/app/assets/javascripts/form/form.coffee @@ -57,4 +57,4 @@ Form.init = ($el) -> el : $el form.initValidationObject() form.initFormAjax() - form \ No newline at end of file + form diff --git a/app/views/rademade_admin/_blocks/_form.html.erb b/app/views/rademade_admin/_blocks/_form.html.erb index ff4860dc..25053e5e 100644 --- a/app/views/rademade_admin/_blocks/_form.html.erb +++ b/app/views/rademade_admin/_blocks/_form.html.erb @@ -1,8 +1,12 @@ <% -concat render :template => @template_service.content_item_layout, :locals => { - :content_header => @model_info.item_name, - :content_url => admin_list_uri(@model_info) -} if @with_layout %> +if @with_layout + content_url = admin_list_uri(@model_info) + concat render :template => @template_service.content_item_layout, :locals => { + :content_header => @model_info.item_name, + :content_url => content_url + } if content_url +end +%> <% content_for :content do %><% buttons_template ||= @template_service.form_control_block diff --git a/app/views/rademade_admin/_blocks/_list.html.erb b/app/views/rademade_admin/_blocks/_list.html.erb index 64f2ec78..9946f5e4 100644 --- a/app/views/rademade_admin/_blocks/_list.html.erb +++ b/app/views/rademade_admin/_blocks/_list.html.erb @@ -14,7 +14,7 @@ end %> <% content_for :content do %>
    <%= yield(:nav_buttons) %>
    <% - # concat render @template_service.search_block + concat render @template_service.search_block %>
    <% @@ -23,8 +23,8 @@ end %> %>
    <% - # concat render @template_service.pagination_block - # concat render @template_service.on_page_switcher_block + concat render @template_service.pagination_block + concat render @template_service.on_page_switcher_block %>
    <% end From fe231c40c9805e1b5a9481095c2a483b3b0c1d8f Mon Sep 17 00:00:00 2001 From: xfearx Date: Thu, 13 Sep 2018 16:04:25 +0300 Subject: [PATCH 008/114] sequel pagination and search fixes --- config/initializers/patches/sequel/kaminari.rb | 15 +++++++++++++++ lib/rademade_admin/model/adapter/query/sequel.rb | 11 +++++++++++ 2 files changed, 26 insertions(+) create mode 100644 config/initializers/patches/sequel/kaminari.rb diff --git a/config/initializers/patches/sequel/kaminari.rb b/config/initializers/patches/sequel/kaminari.rb new file mode 100644 index 00000000..3bb81540 --- /dev/null +++ b/config/initializers/patches/sequel/kaminari.rb @@ -0,0 +1,15 @@ +module Sequel + class Dataset + module Pagination + + def total_pages + page_count + end + + def limit_value + page_size + end + + end + end +end diff --git a/lib/rademade_admin/model/adapter/query/sequel.rb b/lib/rademade_admin/model/adapter/query/sequel.rb index df4b2368..aa74e18e 100644 --- a/lib/rademade_admin/model/adapter/query/sequel.rb +++ b/lib/rademade_admin/model/adapter/query/sequel.rb @@ -17,6 +17,17 @@ def initial protected + def build_where_condition(field: nil, value: nil) + field = table_field(field) + if value.is_a? Regexp + ["LOWER(#{field}) ~* ?", [value.source]] + elsif value.is_a? Array + ["#{field} IN (?)", [value]] + else + ["#{field} = ?", [value]] + end + end + def order(order_conditions) order_conditions.parts.each do |part| if part.is_a? RademadeAdmin::Search::Part::Order From acf983313a3a2fb357570f5dbd21b17610e02d1c Mon Sep 17 00:00:00 2001 From: xfearx Date: Thu, 20 Sep 2018 17:57:30 +0300 Subject: [PATCH 009/114] fixed pagination --- app/services/search/conditions/abstract.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/search/conditions/abstract.rb b/app/services/search/conditions/abstract.rb index 1574c577..29783d11 100644 --- a/app/services/search/conditions/abstract.rb +++ b/app/services/search/conditions/abstract.rb @@ -48,7 +48,7 @@ def paginate if page.nil? || per_page.nil? nil else - [page, per_page] + [page.to_i, per_page.to_i] end end From 5aa50b9ef918af607f734c0e6b7ede27e34dff9a Mon Sep 17 00:00:00 2001 From: xfearx Date: Fri, 21 Sep 2018 15:46:52 +0300 Subject: [PATCH 010/114] fixed save for sequel with many_to_many --- app/services/saver.rb | 3 ++- lib/rademade_admin/model/adapter/persistence/sequel.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/services/saver.rb b/app/services/saver.rb index edef419d..97fb4813 100644 --- a/app/services/saver.rb +++ b/app/services/saver.rb @@ -24,8 +24,9 @@ def find_model def set_data save_simple_fields save_localizable_fields - save_model_relations save_model_uploads + save_item # save before setting relations + save_model_relations end def save_item diff --git a/lib/rademade_admin/model/adapter/persistence/sequel.rb b/lib/rademade_admin/model/adapter/persistence/sequel.rb index 3329ccc9..7652edaf 100644 --- a/lib/rademade_admin/model/adapter/persistence/sequel.rb +++ b/lib/rademade_admin/model/adapter/persistence/sequel.rb @@ -10,7 +10,7 @@ def new?(record) end def save(record) - record.save + record.save_changes end end From 5a367b306af49eca8a4bb0e378ab488aa51edaff Mon Sep 17 00:00:00 2001 From: xfearx Date: Fri, 28 Sep 2018 16:03:35 +0300 Subject: [PATCH 011/114] removed buttons from form, added empty wrapper --- app/assets/javascripts/app/templates/related-item.jst.ejs | 4 ++-- config/initializers/simple_form/wrappers.rb | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/templates/related-item.jst.ejs b/app/assets/javascripts/app/templates/related-item.jst.ejs index 12226c65..e63a8fcf 100644 --- a/app/assets/javascripts/app/templates/related-item.jst.ejs +++ b/app/assets/javascripts/app/templates/related-item.jst.ejs @@ -2,9 +2,9 @@ if (isSortable) { %><% } -%> +%>
    <%= text %>
    <% if (isDeletable) { - %><% + %>
    <%= I18n.t('rademade_admin.relation.destroy') %>
    <% } %> \ No newline at end of file diff --git a/config/initializers/simple_form/wrappers.rb b/config/initializers/simple_form/wrappers.rb index 95dee941..8f83007b 100644 --- a/config/initializers/simple_form/wrappers.rb +++ b/config/initializers/simple_form/wrappers.rb @@ -18,4 +18,9 @@ input_holder.use :label, :class => 'form-label' end + config.wrappers :empty, :tag => 'div', :class => 'form-box' do |form_box| + form_box.use :html5 + form_box.use :input + end + end \ No newline at end of file From ad7b1784cfe8976cba54ad766217d5b7d9c83613 Mon Sep 17 00:00:00 2001 From: xfearx Date: Wed, 3 Oct 2018 10:46:34 +0300 Subject: [PATCH 012/114] fix spaces bug --- app/assets/javascripts/form/form-ajax.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/form/form-ajax.coffee b/app/assets/javascripts/form/form-ajax.coffee index 5c70249c..b1156d2a 100644 --- a/app/assets/javascripts/form/form-ajax.coffee +++ b/app/assets/javascripts/form/form-ajax.coffee @@ -42,7 +42,7 @@ class @FormAjax extends Backbone.View _cleanArray : (array) -> newArray = [] for val in array - cleanVal = val.replace(/\s+/g, '') + cleanVal = val.trim() if cleanVal.length > 0 newArray = $.merge(newArray, cleanVal.split(',')) if newArray.length is 0 then [''] else newArray From c9ced0ba37151bd07998d7d8bf5639bbd7b3c885 Mon Sep 17 00:00:00 2001 From: xfearx Date: Thu, 4 Oct 2018 19:03:14 +0300 Subject: [PATCH 013/114] fix email and password autocomplete --- config/initializers/simple_form/wrappers.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/initializers/simple_form/wrappers.rb b/config/initializers/simple_form/wrappers.rb index 8f83007b..8ed86b7d 100644 --- a/config/initializers/simple_form/wrappers.rb +++ b/config/initializers/simple_form/wrappers.rb @@ -4,7 +4,7 @@ form_box.use :html5 form_box.use :label, :class => 'form-label' form_box.wrapper :tag => 'span', :class => 'input-holder' do |input_holder| - input_holder.use :input + input_holder.use :input, :autocomplete => 'new-password' end form_box.wrapper :tag => 'div', :class => 'form-description', :unless_blank => true do |hint| hint.use :hint, :wrap_with => { :tag => :span, :class => :'form-description-text' } @@ -20,7 +20,7 @@ config.wrappers :empty, :tag => 'div', :class => 'form-box' do |form_box| form_box.use :html5 - form_box.use :input + form_box.use :input, :autocomplete => 'new-password' end end \ No newline at end of file From 910193724542e73f31b07528a60283b4f0b9f102 Mon Sep 17 00:00:00 2001 From: xfearx Date: Tue, 9 Oct 2018 17:01:17 +0300 Subject: [PATCH 014/114] added loader --- app/assets/javascripts/form/form.coffee | 2 + .../stylesheets/blocks/content/_import.sass | 3 +- .../stylesheets/blocks/content/_loader.sass | 41 +++++++++++++++++++ .../rademade_admin/_layouts/main.html.erb | 5 ++- 4 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 app/assets/stylesheets/blocks/content/_loader.sass diff --git a/app/assets/javascripts/form/form.coffee b/app/assets/javascripts/form/form.coffee index 1a1c35bd..2633652d 100644 --- a/app/assets/javascripts/form/form.coffee +++ b/app/assets/javascripts/form/form.coffee @@ -34,10 +34,12 @@ class @Form extends Backbone.View @$el.triggerHandler.apply(@$el, arguments) _onAjaxStart : () => + $('#loader').removeClass('hide') @formValidation.clearFieldErrors() @sending = true _onAjaxDone : (data) => + $('#loader').addClass('hide') if data.with_return Content.getInstance().moveToPreviousContentItem() else diff --git a/app/assets/stylesheets/blocks/content/_import.sass b/app/assets/stylesheets/blocks/content/_import.sass index 0b04e348..d37f6ae7 100644 --- a/app/assets/stylesheets/blocks/content/_import.sass +++ b/app/assets/stylesheets/blocks/content/_import.sass @@ -6,4 +6,5 @@ @import "actions" @import "tooltip" @import "draggable" -@import "status" \ No newline at end of file +@import "status" +@import "loader" \ No newline at end of file diff --git a/app/assets/stylesheets/blocks/content/_loader.sass b/app/assets/stylesheets/blocks/content/_loader.sass new file mode 100644 index 00000000..431975e4 --- /dev/null +++ b/app/assets/stylesheets/blocks/content/_loader.sass @@ -0,0 +1,41 @@ +.loader-wrapper + position: fixed + z-index: 999 + top: 0 + left: 0 + right: 0 + bottom: 0 + background-color: rgba(0,0,0,.5) + +.lds-hourglass + position: absolute + top: 50% + left: 50% + display: inline-block + width: 64px + height: 64px + transform: translate(-50%, -50%) + +.lds-hourglass:after + content: " " + display: block + border-radius: 50% + width: 0 + height: 0 + margin: 6px + box-sizing: border-box + border: 26px solid #fff + border-color: #fff transparent #fff transparent + animation: lds-hourglass 1.2s infinite + +@keyframes lds-hourglass + 0% + transform: rotate(0) + animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19) + + 50% + transform: rotate(900deg) + animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1) + + 100% + transform: rotate(1800deg) diff --git a/app/views/rademade_admin/_layouts/main.html.erb b/app/views/rademade_admin/_layouts/main.html.erb index 6158cbc7..b6edf9c5 100644 --- a/app/views/rademade_admin/_layouts/main.html.erb +++ b/app/views/rademade_admin/_layouts/main.html.erb @@ -2,7 +2,10 @@ <%= render @template_service.layout_head %> -
    <% +
    +
    +
    +
    <% concat render @template_service.navigation_block %>
    From 96503c4bee11909248048f6f21d56e69cfc49aca Mon Sep 17 00:00:00 2001 From: xfearx Date: Thu, 11 Oct 2018 11:04:04 +0300 Subject: [PATCH 015/114] fixed bug with loader --- app/assets/javascripts/form/form.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/form/form.coffee b/app/assets/javascripts/form/form.coffee index 2633652d..7c216793 100644 --- a/app/assets/javascripts/form/form.coffee +++ b/app/assets/javascripts/form/form.coffee @@ -39,7 +39,6 @@ class @Form extends Backbone.View @sending = true _onAjaxDone : (data) => - $('#loader').addClass('hide') if data.with_return Content.getInstance().moveToPreviousContentItem() else @@ -50,6 +49,7 @@ class @Form extends Backbone.View @formValidation.displayFieldErrors(data.errors) _onAjaxFinish : (data) => + $('#loader').addClass('hide') @trigger 'ajax-submit-always', [data] @sending = false From 04dfb9f689aeb6a38d5f8b680c9cc46ade8dc03e Mon Sep 17 00:00:00 2001 From: xfearx Date: Tue, 16 Oct 2018 11:52:53 +0300 Subject: [PATCH 016/114] fix gallery bug --- app/inputs/rademade_admin/gallery_input.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/inputs/rademade_admin/gallery_input.rb b/app/inputs/rademade_admin/gallery_input.rb index 7889d96a..58956b14 100644 --- a/app/inputs/rademade_admin/gallery_input.rb +++ b/app/inputs/rademade_admin/gallery_input.rb @@ -69,7 +69,7 @@ def gallery end def gallery_info - @gallery_relation ||= model_info(object.class.to_s, attribute_name) + @gallery_relation ||= model_info(object.class, attribute_name) end def gallery_image_info From 5c399b78d6d04fb731137753985eb1bf021013f2 Mon Sep 17 00:00:00 2001 From: xfearx Date: Thu, 18 Oct 2018 12:33:17 +0300 Subject: [PATCH 017/114] fix error message --- app/assets/javascripts/form/form-ajax.coffee | 1 - app/assets/javascripts/form/form-validation.coffee | 9 ++++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/form/form-ajax.coffee b/app/assets/javascripts/form/form-ajax.coffee index b1156d2a..f587e86d 100644 --- a/app/assets/javascripts/form/form-ajax.coffee +++ b/app/assets/javascripts/form/form-ajax.coffee @@ -24,7 +24,6 @@ class @FormAjax extends Backbone.View _onAlways : (response) => data = if (response.responseJSON) then response.responseJSON else response - window.notifier.notify(data.message) if data.message @trigger 'ajax-finish', data _getData : () -> diff --git a/app/assets/javascripts/form/form-validation.coffee b/app/assets/javascripts/form/form-validation.coffee index c267373c..fa324847 100644 --- a/app/assets/javascripts/form/form-validation.coffee +++ b/app/assets/javascripts/form/form-validation.coffee @@ -6,9 +6,12 @@ class @FormValidation extends Backbone.View @validationObject = options.validationObject displayFieldErrors : (errors) -> - [messages, globalMessages] = @_collectErrorMessages(errors) - @_showErrorMessages(messages) - @_showGlobalErrorMessages(globalMessages) + if _.isArray(errors) + [messages, globalMessages] = @_collectErrorMessages(errors) + @_showErrorMessages(messages) + @_showGlobalErrorMessages(globalMessages) + else + window.notifier.notify errors false clearFieldErrors : () -> From 823af34f8e96b04cf5fa10cc33051425b9b1ac02 Mon Sep 17 00:00:00 2001 From: xfearx Date: Wed, 24 Oct 2018 15:55:47 +0300 Subject: [PATCH 018/114] feature: added opportunity to add url params to links --- app/assets/javascripts/app/content/view.coffee | 7 ++++--- app/assets/javascripts/app/select2/related/view.coffee | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/app/content/view.coffee b/app/assets/javascripts/app/content/view.coffee index 5e477df0..b8f0a81a 100644 --- a/app/assets/javascripts/app/content/view.coffee +++ b/app/assets/javascripts/app/content/view.coffee @@ -1,9 +1,9 @@ class @Content extends Backbone.View - renderItemFromUrl : (url, cb) -> + renderItemFromUrl : (url, cb, urlData = {}) -> $(document).trigger 'before-content-render' @_updateHistory(url) - $.get url, layout : false, (html) => + $.get url, _.extend(urlData, layout : false), (html) => $contentItem = $(html) $('[data-content]').append $contentItem $(window).scrollTop(0) @@ -11,11 +11,12 @@ class @Content extends Backbone.View @bindClick $contentItem cb($contentItem) if cb - renderModel : (model) -> + renderModel : (model, urlData = {}) -> @renderItemFromUrl model.get('editurl'), ($contentItem) => $contentItem.find('form').on 'ajax-submit-done', (e, response) => model.update response.data $contentItem.remove() + , urlData moveToPreviousContentItem : () -> @moveToContentItem $('[data-content-item]:nth-last-child(2)') diff --git a/app/assets/javascripts/app/select2/related/view.coffee b/app/assets/javascripts/app/select2/related/view.coffee index e5bf434f..23cb82e4 100644 --- a/app/assets/javascripts/app/select2/related/view.coffee +++ b/app/assets/javascripts/app/select2/related/view.coffee @@ -14,7 +14,7 @@ class @Select2Input.RelatedView extends Backbone.View editRelation : (e) -> e.preventDefault() - Content.getInstance().renderModel @model + Content.getInstance().renderModel @model, @$el.data('additional-url-options') removeRelation : (e) -> e.preventDefault() From 9fd3bb8dfd8096b4d1650d2839691320526d818b Mon Sep 17 00:00:00 2001 From: xfearx Date: Fri, 26 Oct 2018 12:15:43 +0300 Subject: [PATCH 019/114] fixed success popup --- app/assets/javascripts/form/form-ajax.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/form/form-ajax.coffee b/app/assets/javascripts/form/form-ajax.coffee index f587e86d..02c7f53d 100644 --- a/app/assets/javascripts/form/form-ajax.coffee +++ b/app/assets/javascripts/form/form-ajax.coffee @@ -16,6 +16,7 @@ class @FormAjax extends Backbone.View _onDone : (data) => @trigger 'ajax-done', data + window.notifier.notify(data.message) if data.message @$el.find('.error-message').remove() _onFail : (response) => From 7a30f8738a9ad607a3911da22695b8059e0ec345 Mon Sep 17 00:00:00 2001 From: xfearx Date: Tue, 30 Oct 2018 12:00:37 +0200 Subject: [PATCH 020/114] fix generate params to additional attrs --- app/assets/javascripts/app/select2/view.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/select2/view.coffee b/app/assets/javascripts/app/select2/view.coffee index 10c701fc..b478c7d9 100644 --- a/app/assets/javascripts/app/select2/view.coffee +++ b/app/assets/javascripts/app/select2/view.coffee @@ -59,7 +59,7 @@ class @Select2Input.View extends Backbone.View $addPlaceholder = $ @_placeholderForAdd() $addPlaceholder.click () => @$item.select2('close') - Content.getInstance().renderModel @_createRelatedModel(@model.get('newUrl')) + Content.getInstance().renderModel @_createRelatedModel(@model.get('newUrl')), $addPlaceholder.data('additionalUrlOptions') @$item.select2('container').find('.select2-drop').append $addPlaceholder _getUrl : () -> From 3e1659ae7ca51b60a419ee80ebc33906fa700c50 Mon Sep 17 00:00:00 2001 From: xfearx Date: Tue, 13 Nov 2018 13:35:32 +0200 Subject: [PATCH 021/114] fixed with work and validation --- app/assets/javascripts/form/form-validation.coffee | 13 +++++++++---- app/services/error_service.rb | 2 ++ app/services/login.rb | 1 + lib/rademade_admin/field_error.rb | 14 ++++++++++++++ .../model/adapter/persistence/sequel.rb | 2 +- 5 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 lib/rademade_admin/field_error.rb diff --git a/app/assets/javascripts/form/form-validation.coffee b/app/assets/javascripts/form/form-validation.coffee index fa324847..a21c6f57 100644 --- a/app/assets/javascripts/form/form-validation.coffee +++ b/app/assets/javascripts/form/form-validation.coffee @@ -6,7 +6,7 @@ class @FormValidation extends Backbone.View @validationObject = options.validationObject displayFieldErrors : (errors) -> - if _.isArray(errors) + if _.isArray(errors) || _.isObject(errors) [messages, globalMessages] = @_collectErrorMessages(errors) @_showErrorMessages(messages) @_showGlobalErrorMessages(globalMessages) @@ -33,6 +33,8 @@ class @FormValidation extends Backbone.View name = "data[#{field}]" if $("[name='#{name}']").length > 0 messages[name] = message + else if $("[name='#{name}[]']").length > 0 + messages["#{name}[]"] = message else $("[name*='#{name}']").each (index) -> messages[@name] = '' @@ -55,9 +57,12 @@ class @FormValidation extends Backbone.View $.validator.setDefaults showErrors : (errorMap, errorList) => _.each errorList, (error) => - $error = $(error.element) - $error.parent().addClass 'in-error' - $error.after @_getErrorNotifier(error) + $holder = $(error.element).closest('.input-holder') + $holder.addClass 'in-error' + $holder.append @_getErrorNotifier(error) + $('html, body').animate({ + scrollTop : $holder.offset().top - 50 + }, 500); @_getErrorNotifier : (message) -> $([ diff --git a/app/services/error_service.rb b/app/services/error_service.rb index 9021e05d..13e67fd1 100644 --- a/app/services/error_service.rb +++ b/app/services/error_service.rb @@ -7,6 +7,8 @@ def error_messages_for(error) error.record.errors elsif sequel_error?(error) error.errors + elsif error.is_a?(RademadeAdmin::FieldError) + error.error_hash else error.message end diff --git a/app/services/login.rb b/app/services/login.rb index ea6b6518..ba7f8845 100644 --- a/app/services/login.rb +++ b/app/services/login.rb @@ -1,4 +1,5 @@ # -*- encoding : utf-8 -*- +# todo remove module RademadeAdmin class Login diff --git a/lib/rademade_admin/field_error.rb b/lib/rademade_admin/field_error.rb new file mode 100644 index 00000000..ad08f09f --- /dev/null +++ b/lib/rademade_admin/field_error.rb @@ -0,0 +1,14 @@ +module RademadeAdmin + class FieldError < Exception + + def initialize(field, message) + super(message) + @field = field + end + + def error_hash + { @field => message } + end + + end +end \ No newline at end of file diff --git a/lib/rademade_admin/model/adapter/persistence/sequel.rb b/lib/rademade_admin/model/adapter/persistence/sequel.rb index 7652edaf..3329ccc9 100644 --- a/lib/rademade_admin/model/adapter/persistence/sequel.rb +++ b/lib/rademade_admin/model/adapter/persistence/sequel.rb @@ -10,7 +10,7 @@ def new?(record) end def save(record) - record.save_changes + record.save end end From 9732dbc3554a930e8b5d0c9a94dbba995acec75b Mon Sep 17 00:00:00 2001 From: xfearx Date: Fri, 30 Nov 2018 15:14:52 +0200 Subject: [PATCH 022/114] added functionality for sort images --- app/controllers/rademade_admin/model_controller.rb | 2 +- app/services/model_controller/notifier.rb | 2 +- lib/rademade_admin/model/adapter/data/sequel.rb | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/rademade_admin/model_controller.rb b/app/controllers/rademade_admin/model_controller.rb index 0596a86b..340f01b6 100644 --- a/app/controllers/rademade_admin/model_controller.rb +++ b/app/controllers/rademade_admin/model_controller.rb @@ -8,7 +8,7 @@ class ModelController < RademadeAdmin::AbstractController include RademadeAdmin::InstanceOptions include RademadeAdmin::Templates include RademadeAdmin::Notifier - + helper RademadeAdmin::FieldHelper helper RademadeAdmin::FieldTypeHelper helper RademadeAdmin::FormHelper diff --git a/app/services/model_controller/notifier.rb b/app/services/model_controller/notifier.rb index 90a63770..1e7342f3 100644 --- a/app/services/model_controller/notifier.rb +++ b/app/services/model_controller/notifier.rb @@ -30,7 +30,7 @@ def success_delete(item) format.json { success_message(item, I18n.t('rademade_admin.success_message.delete')) } end end - + def success_status_change(item) respond_to do |format| format.html { redirect_to admin_list_uri(item) } diff --git a/lib/rademade_admin/model/adapter/data/sequel.rb b/lib/rademade_admin/model/adapter/data/sequel.rb index 657ab74f..3b059b9d 100644 --- a/lib/rademade_admin/model/adapter/data/sequel.rb +++ b/lib/rademade_admin/model/adapter/data/sequel.rb @@ -37,6 +37,7 @@ def _map_relations to_class = RademadeAdmin::LoaderService.const_get(relation_info[:class_name]) rescue nil has_many = has_many_relations.include?(relation_info[:type]) getter = name + is_sortable = to_class ? to_class.columns.include?(:position) : false relations[name] = _relation_class_name(to_class).new({ :name => name, :from => @model, @@ -48,7 +49,8 @@ def _map_relations :many => relation_info[:type] == :one_to_many, :has_many => has_many, :destroyable => _relation_destroyable?, - :sortable => false, + :sortable => is_sortable, + :sortable_field => is_sortable ? :position : nil, :foreign_key => relation_info[:key] }) end From 7f4dc51582c5dee236c849ce01cd12ab8ab59879 Mon Sep 17 00:00:00 2001 From: xfearx Date: Fri, 30 Nov 2018 17:37:40 +0200 Subject: [PATCH 023/114] fixed bug with gallery --- app/services/gallery/manager.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/services/gallery/manager.rb b/app/services/gallery/manager.rb index cdf867e6..59c08a67 100644 --- a/app/services/gallery/manager.rb +++ b/app/services/gallery/manager.rb @@ -76,7 +76,12 @@ def update_gallery_image_position(gallery, gallery_image) if gallery_image_relation.sortable? last_image = gallery.images.last previous_position = last_image.nil? ? 0 : last_image.send(gallery_image_relation.sortable_field.to_sym) - set_gallery_image_position(gallery_image, previous_position + 1) + if previous_position + new_position = previous_position + 1 + else + new_position = gallery.images.count + end + set_gallery_image_position(gallery_image, new_position) end end From 83cd080b5bb5a80fde18a381d84eab98107acdae Mon Sep 17 00:00:00 2001 From: andrey-abramow Date: Mon, 3 Dec 2018 13:23:36 +0200 Subject: [PATCH 024/114] Add forgot password functionality --- .../app/forms/forgot-password-form.coffee | 4 + .../rademade_admin/dashboard_controller.rb | 2 +- .../forgot_passwords_controller.rb | 34 +++++ .../reset_passwords_controller.rb | 40 ++++++ app/helpers/rademade_admin/form_helper.rb | 11 ++ .../rademade_admin/application_mailer.rb | 8 ++ app/mailers/rademade_admin/user_mailer.rb | 14 ++ app/services/reset_password.rb | 19 +++ app/services/reset_password_token.rb | 58 +++++++++ .../layouts/rademade_admin/mailer.html.erb | 13 ++ .../_layouts/forgot_password.html.erb | 7 + .../rademade_admin/dashboard/login.html.erb | 7 +- .../forgot_passwords/show.html.erb | 18 +++ .../forgot_passwords/success.html.erb | 10 ++ .../reset_passwords/show.html.erb | 19 +++ .../user_mailer/reset_password.html.erb | 5 + config/initializers/simple_form/wrappers.rb | 1 + config/locales/rademade_admin.en.yml | 12 ++ config/locales/rademade_admin.ru.yml | 10 ++ config/routes.rb | 6 + rademade_admin.gemspec | 120 +++++++----------- 21 files changed, 339 insertions(+), 79 deletions(-) create mode 100644 app/assets/javascripts/app/forms/forgot-password-form.coffee create mode 100644 app/controllers/rademade_admin/forgot_passwords_controller.rb create mode 100644 app/controllers/rademade_admin/reset_passwords_controller.rb create mode 100644 app/mailers/rademade_admin/application_mailer.rb create mode 100644 app/mailers/rademade_admin/user_mailer.rb create mode 100644 app/services/reset_password.rb create mode 100644 app/services/reset_password_token.rb create mode 100644 app/views/layouts/rademade_admin/mailer.html.erb create mode 100644 app/views/rademade_admin/_layouts/forgot_password.html.erb create mode 100644 app/views/rademade_admin/forgot_passwords/show.html.erb create mode 100644 app/views/rademade_admin/forgot_passwords/success.html.erb create mode 100644 app/views/rademade_admin/reset_passwords/show.html.erb create mode 100644 app/views/rademade_admin/user_mailer/reset_password.html.erb diff --git a/app/assets/javascripts/app/forms/forgot-password-form.coffee b/app/assets/javascripts/app/forms/forgot-password-form.coffee new file mode 100644 index 00000000..7e4129f2 --- /dev/null +++ b/app/assets/javascripts/app/forms/forgot-password-form.coffee @@ -0,0 +1,4 @@ +$(document).on 'ready page:load', -> + + $('#forgot-password-form').on + 'ajax-submit-done': (e) -> console.log(e) \ No newline at end of file diff --git a/app/controllers/rademade_admin/dashboard_controller.rb b/app/controllers/rademade_admin/dashboard_controller.rb index 0743b001..b40654d8 100644 --- a/app/controllers/rademade_admin/dashboard_controller.rb +++ b/app/controllers/rademade_admin/dashboard_controller.rb @@ -6,7 +6,7 @@ class DashboardController < RademadeAdmin::AbstractController helper RademadeAdmin::MenuHelper helper RademadeAdmin::UriHelper - skip_before_action :require_login, :only => [:login] + skip_before_action :require_login, :only => [:login, :forgot_passwords] def index diff --git a/app/controllers/rademade_admin/forgot_passwords_controller.rb b/app/controllers/rademade_admin/forgot_passwords_controller.rb new file mode 100644 index 00000000..1ef13a72 --- /dev/null +++ b/app/controllers/rademade_admin/forgot_passwords_controller.rb @@ -0,0 +1,34 @@ +# -*- encoding : utf-8 -*- +module RademadeAdmin + class ForgotPasswordsController < RademadeAdmin::AbstractController + + layout 'login' + + helper RademadeAdmin::FormHelper + helper RademadeAdmin::MenuHelper + helper RademadeAdmin::UriHelper + + skip_before_action :require_login + + def show + if admin_logged_in? + redirect_to root_path + end + end + + def create + user = RademadeAdmin.configuration.admin_class.get_by_email(params[:data][:email]) + + if user.nil? + render :json => { errors: { email: I18n.t('rademade_admin.forgot_password.validation.email') } }, status: :precondition_failed + else + token = ResetPasswordToken.encode(user) + UserMailer.reset_password(user, token).deliver_now + + render json: { message: 'Email sent' } + end + + end + + end +end diff --git a/app/controllers/rademade_admin/reset_passwords_controller.rb b/app/controllers/rademade_admin/reset_passwords_controller.rb new file mode 100644 index 00000000..3ac05f58 --- /dev/null +++ b/app/controllers/rademade_admin/reset_passwords_controller.rb @@ -0,0 +1,40 @@ +# -*- encoding : utf-8 -*- +module RademadeAdmin + class ResetPasswordsController < RademadeAdmin::AbstractController + + layout 'login' + + helper RademadeAdmin::FormHelper + helper RademadeAdmin::MenuHelper + helper RademadeAdmin::UriHelper + + skip_before_action :require_login + + def show + # params[:id] is JWT token + # http://localhost:3000/reset_passwords/eyJhbGciOiJIUzI1NiJ9.eyJleHAiOjE1NDM4MTg4MTcsImlzcyI6IlJhZGVtYWRlIGFkbWluIHVzZXIiLCJpYXQiOiIyMDE4LTEyLTAzIDA4OjAzOjM3ICswMjAwIiwiYXVkIjoiYWRtaW4gdXNlciIsImVtYWlsIjoiaWtAcmFkZW1hZGUuY29tIn0.nP8Mj1k1TrlaO0eOqmNBvqILmSU8jWap3usBG9XUqLo + @user = ResetPasswordToken.decode(params[:id]) + rescue + redirect_to root_path + end + + def update + user = ResetPasswordToken.decode(params[:id]) + data = params.require(:data).permit(:password, :password_repeat).merge(user: user).to_hash.symbolize_keys + + RademadeAdmin::ResetPassword.call(data) + + respond_to do |format| + format.html { redirect_to :controller => 'dashboard', :action => 'index' } + format.json { render :json => user } + end + rescue RademadeAdmin::FieldError => e + render :json => { :errors => e.error_hash }, :status => :precondition_failed + rescue JWT::DecodeError + respond_to do |format| + format.html { redirect_to :controller => 'dashboard', :action => 'index' } + format.json { render :json => {} } + end + end + end +end diff --git a/app/helpers/rademade_admin/form_helper.rb b/app/helpers/rademade_admin/form_helper.rb index e36bd72c..f49ed379 100644 --- a/app/helpers/rademade_admin/form_helper.rb +++ b/app/helpers/rademade_admin/form_helper.rb @@ -10,6 +10,10 @@ def login_form(&block) simple_form_for(admin_model_info.persistence_adapter.new_record, login_form_options, &block) end + # def forgot_password_form(&block) + # simple_form_for(:email, forgot_password_form_options, &block) + # end + def admin_field(form, data_item, model_info) if can_read_relation data_item name = data_item.name @@ -52,6 +56,13 @@ def admin_form_options(record, model_info) } end + # def forgot_password_form_options + # { + # :url => [:recovery_password], + # :as => :email + # } + # end + def login_form_options { :wrapper => :rademade_login, diff --git a/app/mailers/rademade_admin/application_mailer.rb b/app/mailers/rademade_admin/application_mailer.rb new file mode 100644 index 00000000..ff0c97c0 --- /dev/null +++ b/app/mailers/rademade_admin/application_mailer.rb @@ -0,0 +1,8 @@ +module RademadeAdmin + + class ApplicationMailer < ActionMailer::Base + default from: 'admin@example.com' + layout 'mailer' + end + +end diff --git a/app/mailers/rademade_admin/user_mailer.rb b/app/mailers/rademade_admin/user_mailer.rb new file mode 100644 index 00000000..22676063 --- /dev/null +++ b/app/mailers/rademade_admin/user_mailer.rb @@ -0,0 +1,14 @@ +module RademadeAdmin + + class UserMailer < RademadeAdmin::ApplicationMailer + + def reset_password(user, token) + @token = token + @user = user + + mail(to: user.email, subject: 'Rademade Admin reset password instructions') + end + + end + +end diff --git a/app/services/reset_password.rb b/app/services/reset_password.rb new file mode 100644 index 00000000..3ea67998 --- /dev/null +++ b/app/services/reset_password.rb @@ -0,0 +1,19 @@ +# -*- encoding : utf-8 -*- +module RademadeAdmin + class ResetPassword + + MIN_PASSWORD_LENGTH = 6 + def self.call(password:, password_repeat:, user:) + error(I18n.t('rademade_admin.login.validation.password_length', length: MIN_PASSWORD_LENGTH), :password) if password.length < MIN_PASSWORD_LENGTH + error(I18n.t('rademade_admin.login.validation.password_not_match'), :password_repeat) if password != password_repeat + error(I18n.t('rademade_admin.login.validation.access_denied'), :password) unless user.admin? + user.password = password + user.save + end + + def self.error(message, field) + raise FieldError.new(field, message) + end + + end +end diff --git a/app/services/reset_password_token.rb b/app/services/reset_password_token.rb new file mode 100644 index 00000000..34f8509a --- /dev/null +++ b/app/services/reset_password_token.rb @@ -0,0 +1,58 @@ +require 'jwt' + +class ResetPasswordToken + + class << self + + def encode(user) + JWT.encode(encode_payload(user), secret(user)) + end + + def decode(token) + payload = decoded_payload(token) + raise Error.new('Invalid payload') unless valid_payload?(payload) + user = RademadeAdmin.configuration.admin_class.get_by_email(payload['email']) + JWT.decode(token, secret(user)) + user + end + + private + + def encode_payload(user) + { + email: user.email + }.reverse_merge!(meta) + end + + def decoded_payload(token) + JWT::Decode.new(token, nil).decode_segments[1] + end + + def secret(user) + "#{user.encrypted_password}#{Rails.application.secrets.secret_key_base}" + end + + def valid_payload?(payload) + if expired(payload) || !payload['email'] + return false + else + return true + end + end + + def meta + { + exp: 30.minutes.from_now.to_i, + iss: 'Rademade admin user', + iat: Time.now, + aud: 'admin user' + } + end + + def expired(payload) + Time.at(payload['exp']) < Time.now + end + + end + +end diff --git a/app/views/layouts/rademade_admin/mailer.html.erb b/app/views/layouts/rademade_admin/mailer.html.erb new file mode 100644 index 00000000..cbd34d2e --- /dev/null +++ b/app/views/layouts/rademade_admin/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/rademade_admin/_layouts/forgot_password.html.erb b/app/views/rademade_admin/_layouts/forgot_password.html.erb new file mode 100644 index 00000000..6b986e31 --- /dev/null +++ b/app/views/rademade_admin/_layouts/forgot_password.html.erb @@ -0,0 +1,7 @@ + + + <%= render @template_service.layout_head %> + +
    <%= yield %>
    + + \ No newline at end of file diff --git a/app/views/rademade_admin/dashboard/login.html.erb b/app/views/rademade_admin/dashboard/login.html.erb index 5163ab56..a516a977 100644 --- a/app/views/rademade_admin/dashboard/login.html.erb +++ b/app/views/rademade_admin/dashboard/login.html.erb @@ -13,6 +13,9 @@ concat f.input :email, :label => t('rademade_admin.login.email'), :placeholder => t('rademade_admin.login.email') concat f.input :password, :label => t('rademade_admin.login.password'), :placeholder => t('rademade_admin.login.password') concat f.submit t('rademade_admin.login.submit'), :class => 'btn login-btn full-width' - end - %>
    + end%> + <%= link_to forgot_passwords_path do %> + <%= t('rademade_admin.login.forgot_password') %> + <% end%> +
    \ No newline at end of file diff --git a/app/views/rademade_admin/forgot_passwords/show.html.erb b/app/views/rademade_admin/forgot_passwords/show.html.erb new file mode 100644 index 00000000..46399633 --- /dev/null +++ b/app/views/rademade_admin/forgot_passwords/show.html.erb @@ -0,0 +1,18 @@ + \ No newline at end of file diff --git a/app/views/rademade_admin/forgot_passwords/success.html.erb b/app/views/rademade_admin/forgot_passwords/success.html.erb new file mode 100644 index 00000000..967a8a73 --- /dev/null +++ b/app/views/rademade_admin/forgot_passwords/success.html.erb @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/app/views/rademade_admin/reset_passwords/show.html.erb b/app/views/rademade_admin/reset_passwords/show.html.erb new file mode 100644 index 00000000..f2a7d14b --- /dev/null +++ b/app/views/rademade_admin/reset_passwords/show.html.erb @@ -0,0 +1,19 @@ + \ No newline at end of file diff --git a/app/views/rademade_admin/user_mailer/reset_password.html.erb b/app/views/rademade_admin/user_mailer/reset_password.html.erb new file mode 100644 index 00000000..9111c3d5 --- /dev/null +++ b/app/views/rademade_admin/user_mailer/reset_password.html.erb @@ -0,0 +1,5 @@ +
    Hello <%= @user.email%>
    +
    To set new password please use link
    +<%= link_to reset_password_url(id: @token) do %> + Forgot Password +<% end%> diff --git a/config/initializers/simple_form/wrappers.rb b/config/initializers/simple_form/wrappers.rb index 8ed86b7d..7327d62e 100644 --- a/config/initializers/simple_form/wrappers.rb +++ b/config/initializers/simple_form/wrappers.rb @@ -11,6 +11,7 @@ end end + # TODO refactor to rademade_form config.wrappers :rademade_login, :tag => 'div', :class => 'input-holder' do |input_holder| input_holder.use :html5 input_holder.use :placeholder diff --git a/config/locales/rademade_admin.en.yml b/config/locales/rademade_admin.en.yml index 9683c7f2..bfc3f7ba 100644 --- a/config/locales/rademade_admin.en.yml +++ b/config/locales/rademade_admin.en.yml @@ -1,6 +1,7 @@ en: rademade_admin: project: "Project" + forgot_password: 'Forgot password?' home: "Home" search: "Search in rubric" show_on_page: "Show" @@ -15,10 +16,21 @@ en: email: "Email" password: "Password" submit: "Log in" + forgot_password: 'Forgot Password' validation: email_not_found: "There is no users with such email" + password_not_match: "Password does not match" + password_length: "Min password length is \"%{length}\"" incorrect_password: "Incorrect password" access_denied: "Access denied" + forgot_password: + submit: "Send instructions" + validation: + email: "There is no users with such email" + reset_password: + submit: "Submit new password" + password: "Password" + password_repeat: "Password repeat" dashboard: greeting: "Hello, %{user_name}" record: diff --git a/config/locales/rademade_admin.ru.yml b/config/locales/rademade_admin.ru.yml index 3a9a81b8..ac956cb2 100644 --- a/config/locales/rademade_admin.ru.yml +++ b/config/locales/rademade_admin.ru.yml @@ -18,7 +18,17 @@ ru: validation: email_not_found: "Пользователь не найден" incorrect_password: "Неверный пароль" + password_not_match": "Пароль не совпадает" + password_length: "Пароль меньше \"%{length}\" символов" access_denied: "Отказано в доступе" + forgot_password: + submit: "Отправить инструкции для восстановления пароля" + validation: + email: "Нет пользователя с таким email" + reset_password: + submit: "Обновить пароль" + password: "Пароль" + password_repeat: "Повторите пароль" dashboard: greeting: "Привет, %{user}" record: diff --git a/config/routes.rb b/config/routes.rb index 23e6bfa1..6af43114 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -21,6 +21,12 @@ post 'sessions' => 'sessions#login' get 'login' => 'dashboard#login', :as => :login + resource :forgot_passwords, only: [:show, :create] + resources :reset_passwords, only: [:show, :update], :constraints => { :id => /.*/ } + + # get 'forgot-password' => 'dashboard#forgot_password', :as => :forgot_password + # post 'forgot-password' => 'dashboard#forgot_password', :as => :forgot_password + resources :sessions do get 'logout', :on => :collection end diff --git a/rademade_admin.gemspec b/rademade_admin.gemspec index c7692e74..af9896be 100644 --- a/rademade_admin.gemspec +++ b/rademade_admin.gemspec @@ -1,82 +1,50 @@ -# -*- encoding: utf-8 -*- -# stub: rademade_admin 0.3.0 ruby lib +#encoding: utf-8 +$:.push File.expand_path('../lib', __FILE__) + +require 'rademade_admin/version' Gem::Specification.new do |s| - s.name = "rademade_admin".freeze - s.version = "0.3.0" + s.name = 'rademade_admin' + s.version = RademadeAdmin::VERSION + s.authors = ['Vladislav Melanitskiy', 'Denis Sergienko', 'Sergey Kuzhavskiy'] + s.email = %w(co@rademade.com olol.toor@gmail.com kuzh@rademade.com) + s.homepage = 'https://github.com/Rademade/rademade_admin' + s.summary = 'Rails admin panel engine' + s.description = 'Best rails admin panel. Great mechanism for customization and rapid development' + s.licenses = ['MIT'] + + s.files = Dir['{app,config,db,lib}/**/*', 'MIT-LICENSE', 'Rakefile', 'Bowerfile', 'README.rdoc'] + s.test_files = Dir['test/**/*'] + + # Core dependencies + s.add_dependency 'rails', '~> 5' + s.add_dependency 'kaminari' + + # Auth + s.add_dependency 'jwt' + + # Images + s.add_dependency 'carrierwave' + s.add_dependency 'light_resizer' + + # Assets + s.add_dependency 'bower-rails', '>= 0.8.2' + s.add_dependency 'sass-rails' + s.add_dependency 'coffee-rails' + s.add_dependency 'autoprefixer-rails' - s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version= - s.require_paths = ["lib".freeze] - s.authors = ["Vladislav Melanitskiy".freeze, "Denis Sergienko".freeze, "Sergey Kuzhavskiy".freeze] - s.date = "2017-05-17" - s.description = "Best rails admin panel. Great mechanism for customization and rapid development".freeze - s.email = ["co@rademade.com".freeze, "olol.toor@gmail.com".freeze, "kuzh@rademade.com".freeze] - s.files = ["Bowerfile".freeze, "Rakefile".freeze, "app/assets".freeze, "app/assets/fonts".freeze, "app/assets/fonts/HelveticaNeueCyr-Black.eot".freeze, "app/assets/fonts/HelveticaNeueCyr-Black.otf".freeze, "app/assets/fonts/HelveticaNeueCyr-Black.svg".freeze, "app/assets/fonts/HelveticaNeueCyr-Black.ttf".freeze, "app/assets/fonts/HelveticaNeueCyr-Black.woff".freeze, "app/assets/fonts/HelveticaNeueCyr-Bold.eot".freeze, "app/assets/fonts/HelveticaNeueCyr-Bold.otf".freeze, "app/assets/fonts/HelveticaNeueCyr-Bold.svg".freeze, "app/assets/fonts/HelveticaNeueCyr-Bold.ttf".freeze, "app/assets/fonts/HelveticaNeueCyr-Bold.woff".freeze, "app/assets/fonts/HelveticaNeueCyr-Light.eot".freeze, "app/assets/fonts/HelveticaNeueCyr-Light.otf".freeze, "app/assets/fonts/HelveticaNeueCyr-Light.svg".freeze, "app/assets/fonts/HelveticaNeueCyr-Light.ttf".freeze, "app/assets/fonts/HelveticaNeueCyr-Light.woff".freeze, "app/assets/fonts/HelveticaNeueCyr-Medium.eot".freeze, "app/assets/fonts/HelveticaNeueCyr-Medium.otf".freeze, "app/assets/fonts/HelveticaNeueCyr-Medium.svg".freeze, "app/assets/fonts/HelveticaNeueCyr-Medium.ttf".freeze, "app/assets/fonts/HelveticaNeueCyr-Medium.woff".freeze, "app/assets/fonts/HelveticaNeueCyr-Roman.eot".freeze, "app/assets/fonts/HelveticaNeueCyr-Roman.otf".freeze, "app/assets/fonts/HelveticaNeueCyr-Roman.svg".freeze, "app/assets/fonts/HelveticaNeueCyr-Roman.ttf".freeze, "app/assets/fonts/HelveticaNeueCyr-Roman.woff".freeze, "app/assets/images".freeze, "app/assets/images/rademade_admin".freeze, "app/assets/images/rademade_admin/fav1.ico".freeze, "app/assets/images/rademade_admin/fav2.ico".freeze, "app/assets/images/rademade_admin/ico".freeze, "app/assets/images/rademade_admin/ico/add.svg".freeze, "app/assets/images/rademade_admin/ico/button_add.svg".freeze, "app/assets/images/rademade_admin/ico/button_add_blue.svg".freeze, "app/assets/images/rademade_admin/ico/calendar-next.svg".freeze, "app/assets/images/rademade_admin/ico/calendar-prev.svg".freeze, "app/assets/images/rademade_admin/ico/checkbox_active.svg".freeze, "app/assets/images/rademade_admin/ico/checkbox_empty.svg".freeze, "app/assets/images/rademade_admin/ico/checked.svg".freeze, "app/assets/images/rademade_admin/ico/close_gray.svg".freeze, "app/assets/images/rademade_admin/ico/close_white.svg".freeze, "app/assets/images/rademade_admin/ico/datetimepicker-next.svg".freeze, "app/assets/images/rademade_admin/ico/datetimepicker-prev.svg".freeze, "app/assets/images/rademade_admin/ico/dd-tile.svg".freeze, "app/assets/images/rademade_admin/ico/delete-small.svg".freeze, "app/assets/images/rademade_admin/ico/discard_red.svg".freeze, "app/assets/images/rademade_admin/ico/dragndrop.svg".freeze, "app/assets/images/rademade_admin/ico/eye.svg".freeze, "app/assets/images/rademade_admin/ico/file.svg".freeze, "app/assets/images/rademade_admin/ico/file_blue.svg".freeze, "app/assets/images/rademade_admin/ico/image.svg".freeze, "app/assets/images/rademade_admin/ico/info.svg".freeze, "app/assets/images/rademade_admin/ico/invisible.svg".freeze, "app/assets/images/rademade_admin/ico/jcrop.svg".freeze, "app/assets/images/rademade_admin/ico/left-arrow.svg".freeze, "app/assets/images/rademade_admin/ico/left-arrow_blue.svg".freeze, "app/assets/images/rademade_admin/ico/link.svg".freeze, "app/assets/images/rademade_admin/ico/logout.svg".freeze, "app/assets/images/rademade_admin/ico/next.svg".freeze, "app/assets/images/rademade_admin/ico/password.svg".freeze, "app/assets/images/rademade_admin/ico/password_red.svg".freeze, "app/assets/images/rademade_admin/ico/pen.svg".freeze, "app/assets/images/rademade_admin/ico/photo.svg".freeze, "app/assets/images/rademade_admin/ico/prev.svg".freeze, "app/assets/images/rademade_admin/ico/rejected.svg".freeze, "app/assets/images/rademade_admin/ico/resize.svg".freeze, "app/assets/images/rademade_admin/ico/right-arrow.svg".freeze, "app/assets/images/rademade_admin/ico/right-arrow_blue.svg".freeze, "app/assets/images/rademade_admin/ico/search.svg".freeze, "app/assets/images/rademade_admin/ico/search_blue.svg".freeze, "app/assets/images/rademade_admin/ico/select-close.svg".freeze, "app/assets/images/rademade_admin/ico/select-edit.svg".freeze, "app/assets/images/rademade_admin/ico/select2-add.svg".freeze, "app/assets/images/rademade_admin/ico/select2.svg".freeze, "app/assets/images/rademade_admin/ico/settings.svg".freeze, "app/assets/images/rademade_admin/ico/sortable-down.svg".freeze, "app/assets/images/rademade_admin/ico/sortable-down_active.svg".freeze, "app/assets/images/rademade_admin/ico/sortable-up.svg".freeze, "app/assets/images/rademade_admin/ico/sortable-up_active.svg".freeze, "app/assets/images/rademade_admin/ico/trash.svg".freeze, "app/assets/images/rademade_admin/ico/trash_r.svg".freeze, "app/assets/images/rademade_admin/ico/trash_white.svg".freeze, "app/assets/images/rademade_admin/ico/user-photo.svg".freeze, "app/assets/images/rademade_admin/ico/user.svg".freeze, "app/assets/images/rademade_admin/ico/user_red.svg".freeze, "app/assets/images/rademade_admin/leaflet".freeze, "app/assets/images/rademade_admin/leaflet/layers-2x.png".freeze, "app/assets/images/rademade_admin/leaflet/layers.png".freeze, "app/assets/images/rademade_admin/leaflet/marker-icon-2x.png".freeze, "app/assets/images/rademade_admin/leaflet/marker-icon.png".freeze, "app/assets/images/rademade_admin/leaflet/marker-shadow.png".freeze, "app/assets/images/rademade_admin/loader.GIF".freeze, "app/assets/images/rademade_admin/notifier-loader-clean.gif".freeze, "app/assets/images/rademade_admin/notifier-loader-plastic.gif".freeze, "app/assets/images/rademade_admin/sprite.svg".freeze, "app/assets/javascripts".freeze, "app/assets/javascripts/app".freeze, "app/assets/javascripts/app/app.coffee".freeze, "app/assets/javascripts/app/common".freeze, "app/assets/javascripts/app/common/cropper.coffee".freeze, "app/assets/javascripts/app/common/datetime-picker.coffee".freeze, "app/assets/javascripts/app/common/dnd-sort.coffee".freeze, "app/assets/javascripts/app/common/image-preview.coffee".freeze, "app/assets/javascripts/app/common/lang-panel.coffee".freeze, "app/assets/javascripts/app/common/location.coffee.erb".freeze, "app/assets/javascripts/app/common/menu.coffee".freeze, "app/assets/javascripts/app/common/status-toggler.coffee".freeze, "app/assets/javascripts/app/common/turboform.coffee".freeze, "app/assets/javascripts/app/common/uploader.coffee".freeze, "app/assets/javascripts/app/common/url-visitor.coffee".freeze, "app/assets/javascripts/app/compatibility".freeze, "app/assets/javascripts/app/compatibility/turbolinks.coffee".freeze, "app/assets/javascripts/app/content".freeze, "app/assets/javascripts/app/content/view.coffee".freeze, "app/assets/javascripts/app/forms".freeze, "app/assets/javascripts/app/forms/insert.coffee".freeze, "app/assets/javascripts/app/forms/login.coffee".freeze, "app/assets/javascripts/app/forms/remove.coffee".freeze, "app/assets/javascripts/app/gallery".freeze, "app/assets/javascripts/app/gallery/image".freeze, "app/assets/javascripts/app/gallery/image/collection-view.coffee".freeze, "app/assets/javascripts/app/gallery/image/collection.coffee".freeze, "app/assets/javascripts/app/gallery/image/model.coffee".freeze, "app/assets/javascripts/app/gallery/image/view.coffee".freeze, "app/assets/javascripts/app/gallery/popup.coffee".freeze, "app/assets/javascripts/app/gallery/view.coffee".freeze, "app/assets/javascripts/app/image".freeze, "app/assets/javascripts/app/image/model.coffee".freeze, "app/assets/javascripts/app/image/preview.coffee".freeze, "app/assets/javascripts/app/notifier".freeze, "app/assets/javascripts/app/notifier/initialize.js".freeze, "app/assets/javascripts/app/select2".freeze, "app/assets/javascripts/app/select2/model.coffee".freeze, "app/assets/javascripts/app/select2/related".freeze, "app/assets/javascripts/app/select2/related/collection-view.coffee".freeze, "app/assets/javascripts/app/select2/related/collection.coffee".freeze, "app/assets/javascripts/app/select2/related/model.coffee".freeze, "app/assets/javascripts/app/select2/related/view.coffee".freeze, "app/assets/javascripts/app/select2/view.coffee".freeze, "app/assets/javascripts/app/templates".freeze, "app/assets/javascripts/app/templates/crop".freeze, "app/assets/javascripts/app/templates/crop/attributes.jst.ejs".freeze, "app/assets/javascripts/app/templates/crop/size.jst.ejs".freeze, "app/assets/javascripts/app/templates/gallery-popup.jst.ejs".freeze, "app/assets/javascripts/app/templates/related-item.jst.ejs".freeze, "app/assets/javascripts/app/templates/select2".freeze, "app/assets/javascripts/app/templates/select2/add.jst.ejs".freeze, "app/assets/javascripts/app/templates/select2/edit.jst.ejs".freeze, "app/assets/javascripts/ckeditor".freeze, "app/assets/javascripts/ckeditor/config.js".freeze, "app/assets/javascripts/form".freeze, "app/assets/javascripts/form/form-ajax.coffee".freeze, "app/assets/javascripts/form/form-initializer.coffee".freeze, "app/assets/javascripts/form/form-validation.coffee".freeze, "app/assets/javascripts/form/form.coffee".freeze, "app/assets/javascripts/rademade_admin.coffee".freeze, "app/assets/javascripts/settings".freeze, "app/assets/javascripts/settings/ajax-csrf.coffee".freeze, "app/assets/stylesheets".freeze, "app/assets/stylesheets/base".freeze, "app/assets/stylesheets/base/_fix.sass".freeze, "app/assets/stylesheets/base/_floats.sass".freeze, "app/assets/stylesheets/base/_import.sass".freeze, "app/assets/stylesheets/base/_main.sass".freeze, "app/assets/stylesheets/base/_reset.sass".freeze, "app/assets/stylesheets/base/_text.sass".freeze, "app/assets/stylesheets/base/_wrapper.sass".freeze, "app/assets/stylesheets/blocks".freeze, "app/assets/stylesheets/blocks/_import.sass".freeze, "app/assets/stylesheets/blocks/button".freeze, "app/assets/stylesheets/blocks/button/_box.sass".freeze, "app/assets/stylesheets/blocks/button/_import.sass".freeze, "app/assets/stylesheets/blocks/button/link".freeze, "app/assets/stylesheets/blocks/button/link/_main.sass".freeze, "app/assets/stylesheets/blocks/button/main".freeze, "app/assets/stylesheets/blocks/button/main/_main.sass".freeze, "app/assets/stylesheets/blocks/button/main/colors".freeze, "app/assets/stylesheets/blocks/button/main/colors/_main.sass".freeze, "app/assets/stylesheets/blocks/button/main/colors/_other.sass".freeze, "app/assets/stylesheets/blocks/button/switch".freeze, "app/assets/stylesheets/blocks/button/switch/_main.sass".freeze, "app/assets/stylesheets/blocks/button/switch/colors".freeze, "app/assets/stylesheets/blocks/button/switch/colors/_blue.sass".freeze, "app/assets/stylesheets/blocks/content".freeze, "app/assets/stylesheets/blocks/content/_actions.sass".freeze, "app/assets/stylesheets/blocks/content/_draggable.sass".freeze, "app/assets/stylesheets/blocks/content/_header.sass".freeze, "app/assets/stylesheets/blocks/content/_import.sass".freeze, "app/assets/stylesheets/blocks/content/_item.sass".freeze, "app/assets/stylesheets/blocks/content/_main.sass".freeze, "app/assets/stylesheets/blocks/content/_search.sass".freeze, "app/assets/stylesheets/blocks/content/_status.sass".freeze, "app/assets/stylesheets/blocks/content/_table.sass".freeze, "app/assets/stylesheets/blocks/content/_tooltip.sass".freeze, "app/assets/stylesheets/blocks/form".freeze, "app/assets/stylesheets/blocks/form/_checkbox.sass".freeze, "app/assets/stylesheets/blocks/form/_description.sass".freeze, "app/assets/stylesheets/blocks/form/_erorr.sass".freeze, "app/assets/stylesheets/blocks/form/_import.sass".freeze, "app/assets/stylesheets/blocks/form/_input.sass".freeze, "app/assets/stylesheets/blocks/form/_label.sass".freeze, "app/assets/stylesheets/blocks/form/_lang.sass".freeze, "app/assets/stylesheets/blocks/form/_main.sass".freeze, "app/assets/stylesheets/blocks/form/_select.sass".freeze, "app/assets/stylesheets/blocks/form/_textarea.sass".freeze, "app/assets/stylesheets/blocks/form/datetimepicker".freeze, "app/assets/stylesheets/blocks/form/datetimepicker/_main.sass".freeze, "app/assets/stylesheets/blocks/form/file".freeze, "app/assets/stylesheets/blocks/form/file/_item.sass".freeze, "app/assets/stylesheets/blocks/form/file/_main.sass".freeze, "app/assets/stylesheets/blocks/form/select2".freeze, "app/assets/stylesheets/blocks/form/select2/_arrow.sass".freeze, "app/assets/stylesheets/blocks/form/select2/_btn.sass".freeze, "app/assets/stylesheets/blocks/form/select2/_choise.sass".freeze, "app/assets/stylesheets/blocks/form/select2/_drop.sass".freeze, "app/assets/stylesheets/blocks/form/select2/_list.sass".freeze, "app/assets/stylesheets/blocks/form/select2/_main.sass".freeze, "app/assets/stylesheets/blocks/form/select2/_result.sass".freeze, "app/assets/stylesheets/blocks/login".freeze, "app/assets/stylesheets/blocks/login/_import.sass".freeze, "app/assets/stylesheets/blocks/login/_main.sass".freeze, "app/assets/stylesheets/blocks/login/_project.sass".freeze, "app/assets/stylesheets/blocks/login/_title.sass".freeze, "app/assets/stylesheets/blocks/login/form".freeze, "app/assets/stylesheets/blocks/login/form/_error.sass".freeze, "app/assets/stylesheets/blocks/login/form/_input.sass".freeze, "app/assets/stylesheets/blocks/login/form/_label.sass".freeze, "app/assets/stylesheets/blocks/login/form/_main.sass".freeze, "app/assets/stylesheets/blocks/nav".freeze, "app/assets/stylesheets/blocks/nav/_btn.sass".freeze, "app/assets/stylesheets/blocks/nav/_copyright.sass".freeze, "app/assets/stylesheets/blocks/nav/_counter.sass".freeze, "app/assets/stylesheets/blocks/nav/_dd.sass".freeze, "app/assets/stylesheets/blocks/nav/_import.sass".freeze, "app/assets/stylesheets/blocks/nav/_item.sass".freeze, "app/assets/stylesheets/blocks/nav/_link.sass".freeze, "app/assets/stylesheets/blocks/nav/_logo.sass".freeze, "app/assets/stylesheets/blocks/nav/_main.sass".freeze, "app/assets/stylesheets/blocks/nav/_user.sass".freeze, "app/assets/stylesheets/blocks/pagination".freeze, "app/assets/stylesheets/blocks/pagination/_import.sass".freeze, "app/assets/stylesheets/blocks/pagination/_link-states.sass".freeze, "app/assets/stylesheets/blocks/pagination/_link.sass".freeze, "app/assets/stylesheets/blocks/pagination/_main.sass".freeze, "app/assets/stylesheets/blocks/pagination/_sep.sass".freeze, "app/assets/stylesheets/blocks/popup".freeze, "app/assets/stylesheets/blocks/popup/_action.sass".freeze, "app/assets/stylesheets/blocks/popup/_gallery.sass".freeze, "app/assets/stylesheets/blocks/popup/_import.sass".freeze, "app/assets/stylesheets/blocks/popup/_main.sass".freeze, "app/assets/stylesheets/blocks/popup/_title.sass".freeze, "app/assets/stylesheets/lib".freeze, "app/assets/stylesheets/lib/_import.sass".freeze, "app/assets/stylesheets/lib/_jcrop.sass".freeze, "app/assets/stylesheets/lib/_leaflet.sass".freeze, "app/assets/stylesheets/lib/calendar".freeze, "app/assets/stylesheets/lib/calendar/_import.sass".freeze, "app/assets/stylesheets/lib/calendar/_main.sass".freeze, "app/assets/stylesheets/lib/calendar/date".freeze, "app/assets/stylesheets/lib/calendar/date/_day.sass".freeze, "app/assets/stylesheets/lib/calendar/date/_import.sass".freeze, "app/assets/stylesheets/lib/calendar/date/_main.sass".freeze, "app/assets/stylesheets/lib/calendar/date/_month.sass".freeze, "app/assets/stylesheets/lib/calendar/date/_week.sass".freeze, "app/assets/stylesheets/lib/calendar/time".freeze, "app/assets/stylesheets/lib/calendar/time/_btn.sass".freeze, "app/assets/stylesheets/lib/calendar/time/_import.sass".freeze, "app/assets/stylesheets/lib/calendar/time/_input.sass".freeze, "app/assets/stylesheets/lib/calendar/time/_label.sass".freeze, "app/assets/stylesheets/lib/calendar/time/_main.sass".freeze, "app/assets/stylesheets/mixins".freeze, "app/assets/stylesheets/mixins/_background.sass".freeze, "app/assets/stylesheets/mixins/_clear.sass".freeze, "app/assets/stylesheets/mixins/_column.sass".freeze, "app/assets/stylesheets/mixins/_fonts-mixin.sass".freeze, "app/assets/stylesheets/mixins/_fonts.scss".freeze, "app/assets/stylesheets/mixins/_import.sass".freeze, "app/assets/stylesheets/mixins/_media.sass".freeze, "app/assets/stylesheets/mixins/_placeholder.sass".freeze, "app/assets/stylesheets/mixins/_sprite-m.sass".freeze, "app/assets/stylesheets/mixins/_sprites.scss".freeze, "app/assets/stylesheets/mixins/_text-indent.sass".freeze, "app/assets/stylesheets/mixins/_text-overflow.sass".freeze, "app/assets/stylesheets/mixins/_user-select.sass".freeze, "app/assets/stylesheets/rademade_admin.sass".freeze, "app/assets/stylesheets/var".freeze, "app/assets/stylesheets/var/_color.sass".freeze, "app/assets/stylesheets/var/_import.sass".freeze, "app/assets/stylesheets/var/_media.sass".freeze, "app/assets/stylesheets/var/_path.sass".freeze, "app/controllers".freeze, "app/controllers/rademade_admin".freeze, "app/controllers/rademade_admin/abstract_controller.rb".freeze, "app/controllers/rademade_admin/application_controller.rb".freeze, "app/controllers/rademade_admin/dashboard_controller.rb".freeze, "app/controllers/rademade_admin/file_controller.rb".freeze, "app/controllers/rademade_admin/gallery_controller.rb".freeze, "app/controllers/rademade_admin/model_controller.rb".freeze, "app/controllers/rademade_admin/sessions_controller.rb".freeze, "app/controllers/rademade_admin/status_controller.rb".freeze, "app/helpers".freeze, "app/helpers/rademade_admin".freeze, "app/helpers/rademade_admin/field_helper.rb".freeze, "app/helpers/rademade_admin/field_type_helper.rb".freeze, "app/helpers/rademade_admin/form_helper.rb".freeze, "app/helpers/rademade_admin/menu_helper.rb".freeze, "app/helpers/rademade_admin/pagination_helper.rb".freeze, "app/helpers/rademade_admin/uri_helper.rb".freeze, "app/inputs".freeze, "app/inputs/rademade_admin".freeze, "app/inputs/rademade_admin/boolean_input.rb".freeze, "app/inputs/rademade_admin/date_input.rb".freeze, "app/inputs/rademade_admin/date_time_input.rb".freeze, "app/inputs/rademade_admin/file_input.rb".freeze, "app/inputs/rademade_admin/gallery_input.rb".freeze, "app/inputs/rademade_admin/location_input.rb".freeze, "app/inputs/rademade_admin/related_select_input.rb".freeze, "app/models".freeze, "app/models/rademade_admin".freeze, "app/models/rademade_admin/ability.rb".freeze, "app/serializers".freeze, "app/serializers/autocomplete".freeze, "app/serializers/autocomplete/base_serializer.rb".freeze, "app/services".freeze, "app/services/csv_service.rb".freeze, "app/services/error_service.rb".freeze, "app/services/gallery".freeze, "app/services/gallery/manager.rb".freeze, "app/services/loader_service.rb".freeze, "app/services/login".freeze, "app/services/login.rb".freeze, "app/services/login/error.rb".freeze, "app/services/model_controller".freeze, "app/services/model_controller/instance_options.rb".freeze, "app/services/model_controller/model_options.rb".freeze, "app/services/model_controller/notifier.rb".freeze, "app/services/model_controller/templates.rb".freeze, "app/services/saver.rb".freeze, "app/services/search".freeze, "app/services/search/conditions".freeze, "app/services/search/conditions/abstract.rb".freeze, "app/services/search/conditions/autocomplete.rb".freeze, "app/services/search/conditions/list.rb".freeze, "app/services/search/part".freeze, "app/services/search/part/abstract.rb".freeze, "app/services/search/part/order.rb".freeze, "app/services/search/part/where.rb".freeze, "app/services/search/where.rb".freeze, "app/services/sortable_service.rb".freeze, "app/services/status".freeze, "app/services/status/toggler.rb".freeze, "app/services/template_service.rb".freeze, "app/services/upload".freeze, "app/services/upload/image_presenter.rb".freeze, "app/services/upload/preview".freeze, "app/services/upload/preview.rb".freeze, "app/services/upload/preview/file.rb".freeze, "app/services/upload/preview/gallery.rb".freeze, "app/services/video_service.rb".freeze, "app/views".freeze, "app/views/kaminari".freeze, "app/views/kaminari/rademade".freeze, "app/views/kaminari/rademade/_first_page.html.erb".freeze, "app/views/kaminari/rademade/_gap.html.erb".freeze, "app/views/kaminari/rademade/_last_page.html.erb".freeze, "app/views/kaminari/rademade/_next_page.html.erb".freeze, "app/views/kaminari/rademade/_page.html.erb".freeze, "app/views/kaminari/rademade/_paginator.html.erb".freeze, "app/views/kaminari/rademade/_prev_page.html.erb".freeze, "app/views/layouts".freeze, "app/views/layouts/login.html.erb".freeze, "app/views/layouts/rademade_admin.html.erb".freeze, "app/views/rademade_admin".freeze, "app/views/rademade_admin/_blocks".freeze, "app/views/rademade_admin/_blocks/_form.html.erb".freeze, "app/views/rademade_admin/_blocks/_list.html.erb".freeze, "app/views/rademade_admin/_blocks/_navigation.html.erb".freeze, "app/views/rademade_admin/_blocks/_on_page_switcher.html.erb".freeze, "app/views/rademade_admin/_blocks/_pagination.html.erb".freeze, "app/views/rademade_admin/_blocks/_search.html.erb".freeze, "app/views/rademade_admin/_blocks/button".freeze, "app/views/rademade_admin/_blocks/button/_cancel.html.erb".freeze, "app/views/rademade_admin/_blocks/button/_destroy.html.erb".freeze, "app/views/rademade_admin/_blocks/button/_edit.html.erb".freeze, "app/views/rademade_admin/_blocks/button/_gallery.html.erb".freeze, "app/views/rademade_admin/_blocks/button/_hide.html.erb".freeze, "app/views/rademade_admin/_blocks/button/_preview.html.erb".freeze, "app/views/rademade_admin/_blocks/button/_save.html.erb".freeze, "app/views/rademade_admin/_blocks/button/_save_and_return.html.erb".freeze, "app/views/rademade_admin/_blocks/form".freeze, "app/views/rademade_admin/_blocks/form/_control.html.erb".freeze, "app/views/rademade_admin/_blocks/form/_lang_panel.html.erb".freeze, "app/views/rademade_admin/_blocks/navigation".freeze, "app/views/rademade_admin/_blocks/navigation/_menu.html.erb".freeze, "app/views/rademade_admin/_blocks/navigation/menu".freeze, "app/views/rademade_admin/_blocks/navigation/menu/_item.html.erb".freeze, "app/views/rademade_admin/_blocks/table".freeze, "app/views/rademade_admin/_blocks/table/_head.html.erb".freeze, "app/views/rademade_admin/_blocks/table/_list.html.erb".freeze, "app/views/rademade_admin/_layouts".freeze, "app/views/rademade_admin/_layouts/content_item.html.erb".freeze, "app/views/rademade_admin/_layouts/login.html.erb".freeze, "app/views/rademade_admin/_layouts/main.html.erb".freeze, "app/views/rademade_admin/_layouts/parts".freeze, "app/views/rademade_admin/_layouts/parts/_head.html.erb".freeze, "app/views/rademade_admin/abstract".freeze, "app/views/rademade_admin/abstract/_form.html.erb".freeze, "app/views/rademade_admin/abstract/edit.html.erb".freeze, "app/views/rademade_admin/abstract/form.html.erb".freeze, "app/views/rademade_admin/abstract/index.html.erb".freeze, "app/views/rademade_admin/abstract/new.html.erb".freeze, "app/views/rademade_admin/dashboard".freeze, "app/views/rademade_admin/dashboard/index.html.erb".freeze, "app/views/rademade_admin/dashboard/login.html.erb".freeze, "config/initializers".freeze, "config/initializers/bower_rails.rb".freeze, "config/initializers/carrier_wave".freeze, "config/initializers/carrier_wave/mongoid.rb".freeze, "config/initializers/ckeditor.rb".freeze, "config/initializers/kaminari_route_proxy.rb".freeze, "config/initializers/routes.rb".freeze, "config/initializers/simple_form".freeze, "config/initializers/simple_form.rb".freeze, "config/initializers/simple_form/errors.rb".freeze, "config/initializers/simple_form/rademade_component.rb".freeze, "config/initializers/simple_form/wrappers.rb".freeze, "config/locales".freeze, "config/locales/rademade_admin.en.yml".freeze, "config/locales/rademade_admin.ru.yml".freeze, "config/locales/rademade_kaminari.en.yml".freeze, "config/locales/rademade_kaminari.ru.yml".freeze, "config/locales/select2.en.yml".freeze, "config/locales/select2.ru.yml".freeze, "config/locales/simple_form.en.yml".freeze, "config/locales/simple_form.ru.yml".freeze, "config/routes.rb".freeze, "lib/rademade_admin".freeze, "lib/rademade_admin.rb".freeze, "lib/rademade_admin/bower".freeze, "lib/rademade_admin/bower/performer.rb".freeze, "lib/rademade_admin/ckeditor_utils.rb".freeze, "lib/rademade_admin/engine.rb".freeze, "lib/rademade_admin/gallery.rb".freeze, "lib/rademade_admin/hideable.rb".freeze, "lib/rademade_admin/html_buffer.rb".freeze, "lib/rademade_admin/input".freeze, "lib/rademade_admin/input/related_select_input".freeze, "lib/rademade_admin/input/related_select_input/model_data.rb".freeze, "lib/rademade_admin/input/related_select_input/related_list.rb".freeze, "lib/rademade_admin/model".freeze, "lib/rademade_admin/model/adapter".freeze, "lib/rademade_admin/model/adapter/data".freeze, "lib/rademade_admin/model/adapter/data.rb".freeze, "lib/rademade_admin/model/adapter/data/active_record.rb".freeze, "lib/rademade_admin/model/adapter/data/mongoid.rb".freeze, "lib/rademade_admin/model/adapter/data/sequel.rb".freeze, "lib/rademade_admin/model/adapter/persistence".freeze, "lib/rademade_admin/model/adapter/persistence.rb".freeze, "lib/rademade_admin/model/adapter/persistence/active_record.rb".freeze, "lib/rademade_admin/model/adapter/persistence/mongoid.rb".freeze, "lib/rademade_admin/model/adapter/persistence/sequel.rb".freeze, "lib/rademade_admin/model/adapter/query".freeze, "lib/rademade_admin/model/adapter/query.rb".freeze, "lib/rademade_admin/model/adapter/query/active_record.rb".freeze, "lib/rademade_admin/model/adapter/query/mongoid.rb".freeze, "lib/rademade_admin/model/adapter/query/mysql.rb".freeze, "lib/rademade_admin/model/adapter/query/postgresql.rb".freeze, "lib/rademade_admin/model/adapter/query/sequel.rb".freeze, "lib/rademade_admin/model/adapter/query/sql.rb".freeze, "lib/rademade_admin/model/configuration".freeze, "lib/rademade_admin/model/configuration.rb".freeze, "lib/rademade_admin/model/configuration/csv_fields.rb".freeze, "lib/rademade_admin/model/configuration/field_label.rb".freeze, "lib/rademade_admin/model/configuration/fields.rb".freeze, "lib/rademade_admin/model/configuration/fields_labels.rb".freeze, "lib/rademade_admin/model/configuration/form_field.rb".freeze, "lib/rademade_admin/model/configuration/form_fields.rb".freeze, "lib/rademade_admin/model/configuration/list_field.rb".freeze, "lib/rademade_admin/model/configuration/list_fields.rb".freeze, "lib/rademade_admin/model/graph.rb".freeze, "lib/rademade_admin/model/info".freeze, "lib/rademade_admin/model/info.rb".freeze, "lib/rademade_admin/model/info/data_item".freeze, "lib/rademade_admin/model/info/data_item.rb".freeze, "lib/rademade_admin/model/info/data_item/initializer.rb".freeze, "lib/rademade_admin/model/info/data_items.rb".freeze, "lib/rademade_admin/model/info/field".freeze, "lib/rademade_admin/model/info/field.rb".freeze, "lib/rademade_admin/model/info/field/type.rb".freeze, "lib/rademade_admin/model/info/fields.rb".freeze, "lib/rademade_admin/model/info/relation".freeze, "lib/rademade_admin/model/info/relation.rb".freeze, "lib/rademade_admin/model/info/relation/gallery.rb".freeze, "lib/rademade_admin/model/info/relations.rb".freeze, "lib/rademade_admin/model/info/uploader.rb".freeze, "lib/rademade_admin/model/info/uploaders.rb".freeze, "lib/rademade_admin/model/reflection.rb".freeze, "lib/rademade_admin/routing".freeze, "lib/rademade_admin/routing.rb".freeze, "lib/rademade_admin/routing/mapper.rb".freeze, "lib/rademade_admin/routing/resource.rb".freeze, "lib/rademade_admin/search".freeze, "lib/rademade_admin/search/searcher.rb".freeze, "lib/rademade_admin/sortable.rb".freeze, "lib/rademade_admin/uploader".freeze, "lib/rademade_admin/uploader/carrier_wave.rb".freeze, "lib/rademade_admin/uploader/crop_photo.rb".freeze, "lib/rademade_admin/uploader/photo.rb".freeze, "lib/rademade_admin/uploader/video.rb".freeze, "lib/rademade_admin/user.rb".freeze, "lib/rademade_admin/version.rb".freeze, "lib/tasks".freeze, "lib/tasks/rademade_admin_tasks.rake".freeze, "lib/tasks/rademade_bower_install.rake".freeze, "lib/templates".freeze, "lib/templates/erb".freeze, "lib/templates/erb/scaffold".freeze, "lib/templates/erb/scaffold/_form.html.erb".freeze] - s.homepage = "https://github.com/Rademade/rademade_admin".freeze - s.licenses = ["MIT".freeze] - s.rubygems_version = "2.6.10".freeze - s.summary = "Rails admin panel engine".freeze + s.add_dependency 'i18n-js' + s.add_dependency 'ejs' - if s.respond_to? :specification_version then - s.specification_version = 4 + # Public JS assets + s.add_dependency 'turbolinks' + s.add_dependency 'jquery-rails' + s.add_dependency 'select2-rails', '~> 3.5' - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q.freeze, ["~> 5"]) - s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_runtime_dependency(%q.freeze, [">= 0.8.2"]) - s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_runtime_dependency(%q.freeze, ["~> 3.5"]) - s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_runtime_dependency(%q.freeze, [">= 0"]) - else - s.add_dependency(%q.freeze, ["~> 5"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0.8.2"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, ["~> 3.5"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - end - else - s.add_dependency(%q.freeze, ["~> 5"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0.8.2"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, ["~> 3.5"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - end + # Admin + s.add_dependency 'mini_magick' # TODO remove. Need for ckeditor or light_resizer. + s.add_dependency 'simple_form' + s.add_dependency 'ckeditor' + s.add_dependency 'cancan' + s.add_dependency 'configurations' end From 947a49b90cbacd6e3553655df06fce6fb9b60b14 Mon Sep 17 00:00:00 2001 From: xfearx Date: Tue, 4 Dec 2018 18:27:24 +0200 Subject: [PATCH 025/114] fixed styles priorities --- app/views/rademade_admin/_layouts/parts/_head.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/rademade_admin/_layouts/parts/_head.html.erb b/app/views/rademade_admin/_layouts/parts/_head.html.erb index 458d5a33..a453ecc2 100644 --- a/app/views/rademade_admin/_layouts/parts/_head.html.erb +++ b/app/views/rademade_admin/_layouts/parts/_head.html.erb @@ -3,6 +3,6 @@ <%= favicon_link_tag('rademade_admin/fav1.ico') %> <%= javascript_include_tag(:rademade_admin, 'data-turbolinks-track' => true) %> -<%= yield(:head) if content_for?(:head) %> <%= stylesheet_link_tag(:rademade_admin, :media => 'all', 'data-turbolinks-track' => true) %> +<%= yield(:head) if content_for?(:head) %> <%= csrf_meta_tags %> \ No newline at end of file From db424ba15cf1abc775966e0d583a2f9365c51668 Mon Sep 17 00:00:00 2001 From: xfearx Date: Wed, 5 Dec 2018 15:32:10 +0200 Subject: [PATCH 026/114] added can can implimintation --- app/helpers/rademade_admin/form_helper.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/helpers/rademade_admin/form_helper.rb b/app/helpers/rademade_admin/form_helper.rb index e36bd72c..cd7b4406 100644 --- a/app/helpers/rademade_admin/form_helper.rb +++ b/app/helpers/rademade_admin/form_helper.rb @@ -11,7 +11,7 @@ def login_form(&block) end def admin_field(form, data_item, model_info) - if can_read_relation data_item + if can_read? data_item name = data_item.name attrs = admin_default_params(name, model_info) .merge(field_params(data_item)) @@ -110,8 +110,12 @@ def localized_value(getter, locale) item_value end - def can_read_relation(data_item) - !data_item.has_relation? || can?(:read, data_item.relation.to) + def can_read?(data_item) + if data_item.has_relation? + can?(:read, data_item.relation.to) + else + can?(:access_field, @item, data_item.name) + end end end From fde414c1eba14f6674f676c8c7c8eba082718a32 Mon Sep 17 00:00:00 2001 From: andrey-abramow Date: Thu, 6 Dec 2018 09:06:59 +0200 Subject: [PATCH 027/114] Add reset password redirects --- .../app/forms/forgot-password-form.coffee | 6 ++++-- .../app/forms/reset-password-form.coffee | 5 +++++ .../forgot_passwords_controller.rb | 10 +++++----- .../reset_passwords_controller.rb | 10 ++-------- .../forgot_passwords/show.html.erb | 2 +- .../forgot_passwords/success.html.erb | 17 +++++++---------- 6 files changed, 24 insertions(+), 26 deletions(-) create mode 100644 app/assets/javascripts/app/forms/reset-password-form.coffee diff --git a/app/assets/javascripts/app/forms/forgot-password-form.coffee b/app/assets/javascripts/app/forms/forgot-password-form.coffee index 7e4129f2..6d1a6a83 100644 --- a/app/assets/javascripts/app/forms/forgot-password-form.coffee +++ b/app/assets/javascripts/app/forms/forgot-password-form.coffee @@ -1,4 +1,6 @@ -$(document).on 'ready page:load', -> +$(document).on 'ready page:load init-plugins', -> $('#forgot-password-form').on - 'ajax-submit-done': (e) -> console.log(e) \ No newline at end of file + 'ajax-submit-always': (e, data) -> + if (data.status == 200) + $(e.currentTarget).html(data.responseText) \ No newline at end of file diff --git a/app/assets/javascripts/app/forms/reset-password-form.coffee b/app/assets/javascripts/app/forms/reset-password-form.coffee new file mode 100644 index 00000000..e1aeb0a3 --- /dev/null +++ b/app/assets/javascripts/app/forms/reset-password-form.coffee @@ -0,0 +1,5 @@ +$(document).on 'ready page:load init-plugins', -> + + $('#reset-password-form').on + 'ajax-submit-done': (e) -> + window.location.reload() diff --git a/app/controllers/rademade_admin/forgot_passwords_controller.rb b/app/controllers/rademade_admin/forgot_passwords_controller.rb index 1ef13a72..ed556e52 100644 --- a/app/controllers/rademade_admin/forgot_passwords_controller.rb +++ b/app/controllers/rademade_admin/forgot_passwords_controller.rb @@ -17,15 +17,15 @@ def show end def create - user = RademadeAdmin.configuration.admin_class.get_by_email(params[:data][:email]) + @user = RademadeAdmin.configuration.admin_class.get_by_email(params[:data][:email]) - if user.nil? + if @user.nil? render :json => { errors: { email: I18n.t('rademade_admin.forgot_password.validation.email') } }, status: :precondition_failed else - token = ResetPasswordToken.encode(user) - UserMailer.reset_password(user, token).deliver_now + token = ResetPasswordToken.encode(@user) + UserMailer.reset_password(@user, token).deliver_now - render json: { message: 'Email sent' } + render :success, layout: false end end diff --git a/app/controllers/rademade_admin/reset_passwords_controller.rb b/app/controllers/rademade_admin/reset_passwords_controller.rb index 3ac05f58..ecf0e720 100644 --- a/app/controllers/rademade_admin/reset_passwords_controller.rb +++ b/app/controllers/rademade_admin/reset_passwords_controller.rb @@ -24,17 +24,11 @@ def update RademadeAdmin::ResetPassword.call(data) - respond_to do |format| - format.html { redirect_to :controller => 'dashboard', :action => 'index' } - format.json { render :json => user } - end + render json: { redirect_to: login_url } rescue RademadeAdmin::FieldError => e render :json => { :errors => e.error_hash }, :status => :precondition_failed rescue JWT::DecodeError - respond_to do |format| - format.html { redirect_to :controller => 'dashboard', :action => 'index' } - format.json { render :json => {} } - end + render json: { message: 'Error', with_return: true }, status: 404 end end end diff --git a/app/views/rademade_admin/forgot_passwords/show.html.erb b/app/views/rademade_admin/forgot_passwords/show.html.erb index 46399633..d1fa8efc 100644 --- a/app/views/rademade_admin/forgot_passwords/show.html.erb +++ b/app/views/rademade_admin/forgot_passwords/show.html.erb @@ -1,4 +1,4 @@ - \ No newline at end of file diff --git a/app/views/rademade_admin/forgot_passwords/success.html.erb b/app/views/rademade_admin/forgot_passwords/success.html.erb index b8beb014..c4c0dc0d 100644 --- a/app/views/rademade_admin/forgot_passwords/success.html.erb +++ b/app/views/rademade_admin/forgot_passwords/success.html.erb @@ -1,7 +1,6 @@ -
    - Instructions successfully sent to <%= @user.email %> - - <%= link_to login_path do %> - <%= t('rademade_admin.forgot_password.back_to_login') %> - <% end%> -
    + \ No newline at end of file diff --git a/app/views/rademade_admin/reset_passwords/show.html.erb b/app/views/rademade_admin/reset_passwords/show.html.erb index f2a7d14b..7f263cbd 100644 --- a/app/views/rademade_admin/reset_passwords/show.html.erb +++ b/app/views/rademade_admin/reset_passwords/show.html.erb @@ -6,7 +6,7 @@
    <%= simple_form_for(:data, { url: reset_password_path(id: params[:id]), method: :put, - :wrapper => :rademade_login, + wrapper: :rademade_login, html: { id: 'reset-password-form', class: 'login-form' } }) do |f| %>
    \ No newline at end of file diff --git a/app/views/rademade_admin/user_mailer/reset_password.html.erb b/app/views/rademade_admin/user_mailer/reset_password.html.erb index 9111c3d5..fa10f7c8 100644 --- a/app/views/rademade_admin/user_mailer/reset_password.html.erb +++ b/app/views/rademade_admin/user_mailer/reset_password.html.erb @@ -2,4 +2,4 @@
    To set new password please use link
    <%= link_to reset_password_url(id: @token) do %> Forgot Password -<% end%> +<% end %> diff --git a/config/locales/rademade_admin.en.yml b/config/locales/rademade_admin.en.yml index bfc3f7ba..ae97da91 100644 --- a/config/locales/rademade_admin.en.yml +++ b/config/locales/rademade_admin.en.yml @@ -24,7 +24,10 @@ en: incorrect_password: "Incorrect password" access_denied: "Access denied" forgot_password: + title: "Password recovery" submit: "Send instructions" + success: "Instructions successfully sent to %{email}" + back_to_login: "Back to login" validation: email: "There is no users with such email" reset_password: diff --git a/config/locales/rademade_admin.ru.yml b/config/locales/rademade_admin.ru.yml index ac956cb2..4d9020b8 100644 --- a/config/locales/rademade_admin.ru.yml +++ b/config/locales/rademade_admin.ru.yml @@ -22,7 +22,10 @@ ru: password_length: "Пароль меньше \"%{length}\" символов" access_denied: "Отказано в доступе" forgot_password: + title: "Восстановление пароля" + success: "Инструкции по восстановлению пароля отправлены на %{email}" submit: "Отправить инструкции для восстановления пароля" + back_to_login: "Вернуться к логину" validation: email: "Нет пользователя с таким email" reset_password: From 06ecc379d432f85f58fb3bbac2a278ff7c59f298 Mon Sep 17 00:00:00 2001 From: andrey-abramow Date: Fri, 7 Dec 2018 09:27:52 +0200 Subject: [PATCH 030/114] Refactor: remove logs, slight style fixes --- app/assets/javascripts/form/form-ajax.coffee | 3 --- app/mailers/rademade_admin/user_mailer.rb | 2 +- app/views/rademade_admin/reset_passwords/show.html.erb | 6 +++--- .../rademade_admin/user_mailer/reset_password.html.erb | 1 + 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/form/form-ajax.coffee b/app/assets/javascripts/form/form-ajax.coffee index 83c112fb..02c7f53d 100644 --- a/app/assets/javascripts/form/form-ajax.coffee +++ b/app/assets/javascripts/form/form-ajax.coffee @@ -7,7 +7,6 @@ class @FormAjax extends Backbone.View type : @$el.data('method') || @$el.attr('method') data : @_getData() dataType : 'json' - success: @_onDone ).done(@_onDone).fail(@_onFail).always(@_onAlways) _prepareForAjax : () -> @@ -16,13 +15,11 @@ class @FormAjax extends Backbone.View CKEDITOR.instances[instance].updateElement() _onDone : (data) => - console.log('done') @trigger 'ajax-done', data window.notifier.notify(data.message) if data.message @$el.find('.error-message').remove() _onFail : (response) => - console.log('_onFail') try @trigger 'ajax-fail', JSON.parse(response.responseText) diff --git a/app/mailers/rademade_admin/user_mailer.rb b/app/mailers/rademade_admin/user_mailer.rb index 22676063..f433b47f 100644 --- a/app/mailers/rademade_admin/user_mailer.rb +++ b/app/mailers/rademade_admin/user_mailer.rb @@ -6,7 +6,7 @@ def reset_password(user, token) @token = token @user = user - mail(to: user.email, subject: 'Rademade Admin reset password instructions') + mail(to: user.email) end end diff --git a/app/views/rademade_admin/reset_passwords/show.html.erb b/app/views/rademade_admin/reset_passwords/show.html.erb index 7f263cbd..51822d4e 100644 --- a/app/views/rademade_admin/reset_passwords/show.html.erb +++ b/app/views/rademade_admin/reset_passwords/show.html.erb @@ -11,9 +11,9 @@ <% - concat f.input :password, :label => t('rademade_admin.login.password'), :placeholder => t('rademade_admin.login.password') - concat f.input :password_repeat, :label => t('rademade_admin.reset_password.password_repeat'), :placeholder => t('rademade_admin.reset_password.password_repeat') - concat f.submit t('rademade_admin.reset_password.submit'), :class => 'btn login-btn full-width' + concat f.input :password, label: t('rademade_admin.login.password'), placeholder: t('rademade_admin.login.password') + concat f.input :password_repeat, label: t('rademade_admin.reset_password.password_repeat'), placeholder: t('rademade_admin.reset_password.password_repeat') + concat f.submit t('rademade_admin.reset_password.submit'), class: 'btn login-btn full-width' end %>
\ No newline at end of file diff --git a/app/views/rademade_admin/user_mailer/reset_password.html.erb b/app/views/rademade_admin/user_mailer/reset_password.html.erb index fa10f7c8..42f536ff 100644 --- a/app/views/rademade_admin/user_mailer/reset_password.html.erb +++ b/app/views/rademade_admin/user_mailer/reset_password.html.erb @@ -1,3 +1,4 @@ +<% message.subject = 'Rademade Admin reset password instructions'%>
Hello <%= @user.email%>
To set new password please use link
<%= link_to reset_password_url(id: @token) do %> From f1e1a8a5999d382c3a818e444dc97796b8c35f10 Mon Sep 17 00:00:00 2001 From: andrey-abramow Date: Fri, 7 Dec 2018 09:30:29 +0200 Subject: [PATCH 031/114] Refactor: remove depr TODO --- config/initializers/simple_form/wrappers.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/config/initializers/simple_form/wrappers.rb b/config/initializers/simple_form/wrappers.rb index 7327d62e..8ed86b7d 100644 --- a/config/initializers/simple_form/wrappers.rb +++ b/config/initializers/simple_form/wrappers.rb @@ -11,7 +11,6 @@ end end - # TODO refactor to rademade_form config.wrappers :rademade_login, :tag => 'div', :class => 'input-holder' do |input_holder| input_holder.use :html5 input_holder.use :placeholder From 310a084eb11379f818d84bb6ce7a6b8f95de02ec Mon Sep 17 00:00:00 2001 From: andrey-abramow Date: Fri, 7 Dec 2018 09:51:43 +0200 Subject: [PATCH 032/114] Add mail_from to config --- app/mailers/rademade_admin/application_mailer.rb | 2 +- lib/rademade_admin.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/mailers/rademade_admin/application_mailer.rb b/app/mailers/rademade_admin/application_mailer.rb index ff0c97c0..666abbcf 100644 --- a/app/mailers/rademade_admin/application_mailer.rb +++ b/app/mailers/rademade_admin/application_mailer.rb @@ -1,7 +1,7 @@ module RademadeAdmin class ApplicationMailer < ActionMailer::Base - default from: 'admin@example.com' + default from: RademadeAdmin.configuration.mail_from || 'admin@example.com' layout 'mailer' end diff --git a/lib/rademade_admin.rb b/lib/rademade_admin.rb index bd5727dd..40936944 100644 --- a/lib/rademade_admin.rb +++ b/lib/rademade_admin.rb @@ -20,7 +20,7 @@ module RademadeAdmin include Configurations - configurable :admin_class, :ability_class + configurable :admin_class, :ability_class, :mail_from configuration_defaults do |default_config| default_config.ability_class = ::RademadeAdmin::Ability From eca14ca2344b96680e1ec975a4899dd3d8fd0d2e Mon Sep 17 00:00:00 2001 From: andrey-abramow Date: Fri, 7 Dec 2018 18:13:38 +0200 Subject: [PATCH 033/114] Refactor: rename password token Add ability to customize UserPasswordToken meta --- .../rademade_admin/forgot_passwords_controller.rb | 2 +- .../rademade_admin/reset_passwords_controller.rb | 4 ++-- .../{reset_password_token.rb => user_password_token.rb} | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) rename app/services/{reset_password_token.rb => user_password_token.rb} (91%) diff --git a/app/controllers/rademade_admin/forgot_passwords_controller.rb b/app/controllers/rademade_admin/forgot_passwords_controller.rb index 75ccda99..688bceef 100644 --- a/app/controllers/rademade_admin/forgot_passwords_controller.rb +++ b/app/controllers/rademade_admin/forgot_passwords_controller.rb @@ -18,7 +18,7 @@ def create if @user.nil? render json: { errors: { email: I18n.t('rademade_admin.forgot_password.validation.email') } }, status: :precondition_failed else - token = ResetPasswordToken.encode(@user) + token = UserPasswordToken.encode(@user, { exp: 30.minutes.from_now.to_i }) UserMailer.reset_password(@user, token).deliver_now html_template = render_to_string('rademade_admin/forgot_passwords/success', layout: false) diff --git a/app/controllers/rademade_admin/reset_passwords_controller.rb b/app/controllers/rademade_admin/reset_passwords_controller.rb index 34d6e7c1..92992ff1 100644 --- a/app/controllers/rademade_admin/reset_passwords_controller.rb +++ b/app/controllers/rademade_admin/reset_passwords_controller.rb @@ -8,13 +8,13 @@ class ResetPasswordsController < RademadeAdmin::AbstractController def show # params[:id] is JWT token - @user = ResetPasswordToken.decode(params[:id]) + @user = UserPasswordToken.decode(params[:id]) rescue redirect_to root_path end def update - user = ResetPasswordToken.decode(params[:id]) + user = UserPasswordToken.decode(params[:id]) data = params.require(:data).permit(:password, :password_repeat).merge(user: user).to_hash.symbolize_keys RademadeAdmin::ResetPassword.call(data) diff --git a/app/services/reset_password_token.rb b/app/services/user_password_token.rb similarity index 91% rename from app/services/reset_password_token.rb rename to app/services/user_password_token.rb index 710e7923..5100b0e5 100644 --- a/app/services/reset_password_token.rb +++ b/app/services/user_password_token.rb @@ -1,11 +1,12 @@ require 'jwt' module RademadeAdmin - class ResetPasswordToken + class UserPasswordToken class << self - def encode(user) + def encode(user, meta = {}) + @meta = meta JWT.encode(encode_payload(user), secret(user)) end @@ -43,7 +44,7 @@ def meta iss: 'Rademade admin user', iat: Time.now, aud: 'admin user' - } + }.merge(@meta) end def expired?(payload) From f2463d0ee49676357fa6a7732b5adff686d40c18 Mon Sep 17 00:00:00 2001 From: xfearx Date: Wed, 12 Dec 2018 19:42:37 +0200 Subject: [PATCH 034/114] added ability duplication variants --- .../app/select2/related/collection-view.coffee | 3 +++ .../app/select2/related/collection.coffee | 9 +++++++++ .../javascripts/app/select2/related/view.coffee | 16 ++++++++++++++-- app/assets/javascripts/app/select2/view.coffee | 4 ++++ .../app/templates/related-item.jst.ejs | 8 ++++++-- config/locales/rademade_admin.en.yml | 1 + .../input/related_select_input/related_list.rb | 3 ++- lib/rademade_admin/model/adapter/data/sequel.rb | 7 +++++++ 8 files changed, 46 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/app/select2/related/collection-view.coffee b/app/assets/javascripts/app/select2/related/collection-view.coffee index c7181e3e..08a960ed 100644 --- a/app/assets/javascripts/app/select2/related/collection-view.coffee +++ b/app/assets/javascripts/app/select2/related/collection-view.coffee @@ -25,6 +25,7 @@ class @Select2Input.RelatedCollectionView extends Backbone.View collection = new Select2Input.RelatedCollection collection.setSortable $list.data('sortable') collection.setDeletable $list.data('deletable') + collection.setDuplicatable $list.data('duplicatable') $list.find('li').each () -> relatedView = Select2Input.RelatedView.init $(this) @@ -35,4 +36,6 @@ class @Select2Input.RelatedCollectionView extends Backbone.View el : $list views : views collectionView.initSort() + collection.on 'duplicate', (modelId, additionalUrlOptions) -> + collectionView.trigger 'duplicate', modelId, additionalUrlOptions collectionView \ No newline at end of file diff --git a/app/assets/javascripts/app/select2/related/collection.coffee b/app/assets/javascripts/app/select2/related/collection.coffee index b55ab798..c2d10ca5 100644 --- a/app/assets/javascripts/app/select2/related/collection.coffee +++ b/app/assets/javascripts/app/select2/related/collection.coffee @@ -19,12 +19,21 @@ class @Select2Input.RelatedCollection extends Backbone.Collection setDeletable : (deletable) -> @deletable = deletable + setDuplicatable : (duplicatable) -> + @duplicatable = duplicatable + + setNewUrl : (newUrl) -> + @newUrl = newUrl + isSortable : () -> @sortable isDeletable : () -> @deletable + isDuplicatable : () -> + @duplicatable + resort : () -> @sort() @_triggerChange() diff --git a/app/assets/javascripts/app/select2/related/view.coffee b/app/assets/javascripts/app/select2/related/view.coffee index 23cb82e4..47669f4a 100644 --- a/app/assets/javascripts/app/select2/related/view.coffee +++ b/app/assets/javascripts/app/select2/related/view.coffee @@ -7,6 +7,7 @@ class @Select2Input.RelatedView extends Backbone.View events : 'click [data-edit]' : 'editRelation' 'click [data-remove]' : 'removeRelation' + 'click [data-duplicate]' : 'duplicateRelation' initialize : () -> @model.on 'relation-remove', @remove, this @@ -21,6 +22,10 @@ class @Select2Input.RelatedView extends Backbone.View @model.relationRemove() if confirm I18n.t('rademade_admin.remove_confirm.model') false + duplicateRelation : (e) -> + e.preventDefault() + @model.trigger 'duplicate', @model.id, @$el.data('additional-url-options') + render : () -> @$el.html @_getHtml(@model.toJSON()) @$el.addClass('is-draggable') if @isSortable() @@ -32,16 +37,23 @@ class @Select2Input.RelatedView extends Backbone.View else false - isDeletable: () -> + isDeletable : () -> if @model.collection @model.collection.isDeletable() else false + isDuplicatable : () -> + if @model.collection + @model.collection.isDuplicatable() + else + false + _getHtml : (data) -> JST['app/templates/related-item'] _.extend isSortable : @isSortable() - isDeletable : @isDeletable() + isDeletable : @isDeletable(), + isDuplicatable : @isDuplicatable() , data @init : ($el) -> diff --git a/app/assets/javascripts/app/select2/view.coffee b/app/assets/javascripts/app/select2/view.coffee index b478c7d9..e11adc00 100644 --- a/app/assets/javascripts/app/select2/view.coffee +++ b/app/assets/javascripts/app/select2/view.coffee @@ -17,6 +17,9 @@ class @Select2Input.View extends Backbone.View initRelated : () -> if @model.isMultiple() collectionView = Select2Input.RelatedCollectionView.init @$el.find('.select2-items-list') + collectionView.on 'duplicate', (modelId, additionalUrlOptions) => + options = _.extend({ duplicate_from: modelId }, additionalUrlOptions || {}) + Content.getInstance().renderModel @_createRelatedModel(@model.get('newUrl')), options @model.set 'related', collectionView.collection else relatedData = @$el.children('input[type="hidden"]').data() @@ -96,6 +99,7 @@ class @Select2Input.View extends Backbone.View relatedModel _updateData : () => + $(document).trigger 'view-update' relatedData = @model.getRelatedData() if @model.isMultiple() or relatedData.id @$item.select2('data', relatedData) diff --git a/app/assets/javascripts/app/templates/related-item.jst.ejs b/app/assets/javascripts/app/templates/related-item.jst.ejs index e63a8fcf..787b5ad7 100644 --- a/app/assets/javascripts/app/templates/related-item.jst.ejs +++ b/app/assets/javascripts/app/templates/related-item.jst.ejs @@ -2,9 +2,13 @@ if (isSortable) { %><% } -%>
<%= text %>
-<% +%>
<%= text %>
<% if (isDeletable) { %>
<%= I18n.t('rademade_admin.relation.destroy') %>
<% } +if (isDuplicatable) { + %>
+ +
<% +} %> \ No newline at end of file diff --git a/config/locales/rademade_admin.en.yml b/config/locales/rademade_admin.en.yml index ae97da91..b8b68894 100644 --- a/config/locales/rademade_admin.en.yml +++ b/config/locales/rademade_admin.en.yml @@ -77,3 +77,4 @@ en: edit: "Edit" destroy: "Destroy" search: "Enter search phrase" + duplicate: "Duplicate" diff --git a/lib/rademade_admin/input/related_select_input/related_list.rb b/lib/rademade_admin/input/related_select_input/related_list.rb index 86b2cebc..7335cb40 100644 --- a/lib/rademade_admin/input/related_select_input/related_list.rb +++ b/lib/rademade_admin/input/related_select_input/related_list.rb @@ -11,7 +11,8 @@ def related_list_html :class => 'select2-items-list', :data => { :sortable => sortable_relation?, - :deletable => destroyable_relation? + :deletable => destroyable_relation?, + :duplicatable => options[:duplicatable] } }) end diff --git a/lib/rademade_admin/model/adapter/data/sequel.rb b/lib/rademade_admin/model/adapter/data/sequel.rb index 3b059b9d..5efa760b 100644 --- a/lib/rademade_admin/model/adapter/data/sequel.rb +++ b/lib/rademade_admin/model/adapter/data/sequel.rb @@ -63,6 +63,13 @@ def _relation_destroyable? def _to_many_setter(relation_info, getter) Proc.new do |new_items| + model_info = RademadeAdmin::Model::Graph.instance.model_info(self.class) + if model_info.data_items.data_item(relation_info[:name]).relation.sortable? + new_items.each_with_index do |item, position| + item.position = position + item.save_changes + end + end old_items = self.send(getter) (old_items - new_items).each do |related_item| self.instance_exec(related_item, &relation_info[:remover]) From ee2c209f968b941acb07d2cc893c92762288ff02 Mon Sep 17 00:00:00 2001 From: Praffesor Date: Thu, 13 Dec 2018 14:32:40 +0200 Subject: [PATCH 035/114] fixed autoloading added lazy loading for routes added immediate controller for patching --- .../rademade_admin/abstract_controller.rb | 16 +++- .../rademade_admin/application_controller.rb | 3 +- .../rademade_admin/dashboard_controller.rb | 2 +- .../rademade_admin/file_controller.rb | 4 +- .../forgot_passwords_controller.rb | 2 +- .../rademade_admin/gallery_controller.rb | 4 +- .../rademade_admin/model_controller.rb | 12 +-- .../reset_passwords_controller.rb | 2 +- .../rademade_admin/sessions_controller.rb | 2 +- .../rademade_admin/status_controller.rb | 6 +- .../rademade_admin/related_select_input.rb | 7 +- .../related_select_input/model_data.rb | 38 ++++++++++ .../related_select_input/related_list.rb | 74 ++++++++++++++++++ .../model_controller/instance_options.rb | 46 ----------- .../model_controller/model_options.rb | 49 ------------ app/services/model_controller/notifier.rb | 61 --------------- app/services/model_controller/templates.rb | 24 ------ .../{ => rademade_admin}/csv_service.rb | 0 .../{ => rademade_admin}/error_service.rb | 0 .../{ => rademade_admin}/gallery/manager.rb | 0 .../{ => rademade_admin}/loader_service.rb | 0 app/services/{ => rademade_admin}/login.rb | 0 .../{ => rademade_admin}/login/error.rb | 0 .../instance_options.rb | 48 ++++++++++++ .../model_controller_modules/model_options.rb | 51 +++++++++++++ .../model_controller_modules/notifier.rb | 63 +++++++++++++++ .../model_controller_modules/templates.rb | 26 +++++++ .../{ => rademade_admin}/reset_password.rb | 1 + app/services/{ => rademade_admin}/saver.rb | 0 .../search/conditions/abstract.rb | 0 .../search/conditions/autocomplete.rb | 3 - .../search/conditions/list.rb | 5 +- .../search/part/abstract.rb | 0 .../{ => rademade_admin}/search/part/order.rb | 4 +- .../{ => rademade_admin}/search/part/where.rb | 2 - .../{ => rademade_admin}/search/where.rb | 0 .../{ => rademade_admin}/sortable_service.rb | 0 .../{ => rademade_admin}/status/toggler.rb | 0 .../{ => rademade_admin}/template_service.rb | 0 .../upload/image_presenter.rb | 0 .../{ => rademade_admin}/upload/preview.rb | 0 .../upload/preview/file.rb | 0 .../upload/preview/gallery.rb | 0 .../user_password_token.rb | 0 .../{ => rademade_admin}/video_service.rb | 0 lib/rademade_admin/engine.rb | 17 +---- .../input/related_select_input/model_data.rb | 40 ---------- .../related_select_input/related_list.rb | 76 ------------------- ...active_record.rb => active_record_data.rb} | 4 +- .../data/{mongoid.rb => mongoid_data.rb} | 6 +- .../data/{sequel.rb => sequel_data.rb} | 4 +- ...ongoid.rb => active_record_persistence.rb} | 4 +- ...ctive_record.rb => mongoid_persistence.rb} | 4 +- .../{sequel.rb => sequel_persistence.rb} | 4 +- ...ctive_record.rb => active_record_query.rb} | 6 +- .../query/{mongoid.rb => mongoid_query.rb} | 2 +- .../query/{mysql.rb => mysql_query.rb} | 6 +- .../{postgresql.rb => postgresql_query.rb} | 4 +- .../query/{sequel.rb => sequel_query.rb} | 4 +- .../adapter/query/{sql.rb => sql_query.rb} | 4 +- .../model/configuration/csv_fields.rb | 2 - .../model/configuration/fields_labels.rb | 2 - .../model/configuration/form_fields.rb | 2 - .../model/configuration/list_fields.rb | 2 - lib/rademade_admin/model/graph.rb | 11 +++ lib/rademade_admin/model/reflection.rb | 8 +- lib/rademade_admin/routing/mapper.rb | 2 +- lib/rademade_admin/uploader/carrier_wave.rb | 2 - lib/rademade_admin/uploader/crop_photo.rb | 2 - 69 files changed, 379 insertions(+), 394 deletions(-) create mode 100644 app/inputs/rademade_admin/related_select_input/model_data.rb create mode 100644 app/inputs/rademade_admin/related_select_input/related_list.rb delete mode 100644 app/services/model_controller/instance_options.rb delete mode 100644 app/services/model_controller/model_options.rb delete mode 100644 app/services/model_controller/notifier.rb delete mode 100644 app/services/model_controller/templates.rb rename app/services/{ => rademade_admin}/csv_service.rb (100%) rename app/services/{ => rademade_admin}/error_service.rb (100%) rename app/services/{ => rademade_admin}/gallery/manager.rb (100%) rename app/services/{ => rademade_admin}/loader_service.rb (100%) rename app/services/{ => rademade_admin}/login.rb (100%) rename app/services/{ => rademade_admin}/login/error.rb (100%) create mode 100644 app/services/rademade_admin/model_controller_modules/instance_options.rb create mode 100644 app/services/rademade_admin/model_controller_modules/model_options.rb create mode 100644 app/services/rademade_admin/model_controller_modules/notifier.rb create mode 100644 app/services/rademade_admin/model_controller_modules/templates.rb rename app/services/{ => rademade_admin}/reset_password.rb (99%) rename app/services/{ => rademade_admin}/saver.rb (100%) rename app/services/{ => rademade_admin}/search/conditions/abstract.rb (100%) rename app/services/{ => rademade_admin}/search/conditions/autocomplete.rb (94%) rename app/services/{ => rademade_admin}/search/conditions/list.rb (94%) rename app/services/{ => rademade_admin}/search/part/abstract.rb (100%) rename app/services/{ => rademade_admin}/search/part/order.rb (88%) rename app/services/{ => rademade_admin}/search/part/where.rb (88%) rename app/services/{ => rademade_admin}/search/where.rb (100%) rename app/services/{ => rademade_admin}/sortable_service.rb (100%) rename app/services/{ => rademade_admin}/status/toggler.rb (100%) rename app/services/{ => rademade_admin}/template_service.rb (100%) rename app/services/{ => rademade_admin}/upload/image_presenter.rb (100%) rename app/services/{ => rademade_admin}/upload/preview.rb (100%) rename app/services/{ => rademade_admin}/upload/preview/file.rb (100%) rename app/services/{ => rademade_admin}/upload/preview/gallery.rb (100%) rename app/services/{ => rademade_admin}/user_password_token.rb (100%) rename app/services/{ => rademade_admin}/video_service.rb (100%) delete mode 100644 lib/rademade_admin/input/related_select_input/model_data.rb delete mode 100644 lib/rademade_admin/input/related_select_input/related_list.rb rename lib/rademade_admin/model/adapter/data/{active_record.rb => active_record_data.rb} (98%) rename lib/rademade_admin/model/adapter/data/{mongoid.rb => mongoid_data.rb} (97%) rename lib/rademade_admin/model/adapter/data/{sequel.rb => sequel_data.rb} (98%) rename lib/rademade_admin/model/adapter/persistence/{mongoid.rb => active_record_persistence.rb} (76%) rename lib/rademade_admin/model/adapter/persistence/{active_record.rb => mongoid_persistence.rb} (77%) rename lib/rademade_admin/model/adapter/persistence/{sequel.rb => sequel_persistence.rb} (77%) rename lib/rademade_admin/model/adapter/query/{active_record.rb => active_record_query.rb} (86%) rename lib/rademade_admin/model/adapter/query/{mongoid.rb => mongoid_query.rb} (96%) rename lib/rademade_admin/model/adapter/query/{mysql.rb => mysql_query.rb} (50%) rename lib/rademade_admin/model/adapter/query/{postgresql.rb => postgresql_query.rb} (78%) rename lib/rademade_admin/model/adapter/query/{sequel.rb => sequel_query.rb} (90%) rename lib/rademade_admin/model/adapter/query/{sql.rb => sql_query.rb} (95%) diff --git a/app/controllers/rademade_admin/abstract_controller.rb b/app/controllers/rademade_admin/abstract_controller.rb index c4ea10fd..9aaccbd7 100644 --- a/app/controllers/rademade_admin/abstract_controller.rb +++ b/app/controllers/rademade_admin/abstract_controller.rb @@ -1,6 +1,6 @@ # -*- encoding : utf-8 -*- module RademadeAdmin - class AbstractController < ApplicationController + class AbstractController < ActionController::Base include ::RademadeAdmin::UriHelper @@ -8,8 +8,8 @@ class AbstractController < ApplicationController protect_from_forgery prepend: true - before_action :init_user, :init_template_service, :require_login - + before_action :init_data, :require_login + attr_reader :current_user rescue_from ::CanCan::AccessDenied do |exception| @@ -22,6 +22,16 @@ def require_login redirect_to login_url unless admin_logged_in? end + def init_data + init_model_graph + init_user + init_template_service + end + + def init_model_graph + RademadeAdmin::Model::Graph.instance.init_pairs + end + def init_user if session[:user_id].present? related_info = RademadeAdmin::Model::Graph.instance.model_info(RademadeAdmin.configuration.admin_class) diff --git a/app/controllers/rademade_admin/application_controller.rb b/app/controllers/rademade_admin/application_controller.rb index 32236354..194ee7ee 100644 --- a/app/controllers/rademade_admin/application_controller.rb +++ b/app/controllers/rademade_admin/application_controller.rb @@ -1,6 +1,7 @@ # -*- encoding : utf-8 -*- +# intermediate class for logic rewrite module RademadeAdmin - class ApplicationController < ActionController::Base + class ApplicationController < ::RademadeAdmin::AbstractController end end diff --git a/app/controllers/rademade_admin/dashboard_controller.rb b/app/controllers/rademade_admin/dashboard_controller.rb index 0743b001..233561c5 100644 --- a/app/controllers/rademade_admin/dashboard_controller.rb +++ b/app/controllers/rademade_admin/dashboard_controller.rb @@ -1,6 +1,6 @@ # -*- encoding : utf-8 -*- module RademadeAdmin - class DashboardController < RademadeAdmin::AbstractController + class DashboardController < ::RademadeAdmin::ApplicationController helper RademadeAdmin::FormHelper helper RademadeAdmin::MenuHelper diff --git a/app/controllers/rademade_admin/file_controller.rb b/app/controllers/rademade_admin/file_controller.rb index 08f5339a..fe3e9b02 100644 --- a/app/controllers/rademade_admin/file_controller.rb +++ b/app/controllers/rademade_admin/file_controller.rb @@ -1,5 +1,5 @@ # -*- encoding : utf-8 -*- -class RademadeAdmin::FileController < RademadeAdmin::AbstractController +class RademadeAdmin::FileController < RademadeAdmin::ApplicationController def upload param_key = params[:column].to_sym @@ -48,4 +48,4 @@ def model model_object || model_info.persistence_adapter.new_record end -end \ No newline at end of file +end diff --git a/app/controllers/rademade_admin/forgot_passwords_controller.rb b/app/controllers/rademade_admin/forgot_passwords_controller.rb index 688bceef..df05634f 100644 --- a/app/controllers/rademade_admin/forgot_passwords_controller.rb +++ b/app/controllers/rademade_admin/forgot_passwords_controller.rb @@ -1,6 +1,6 @@ # -*- encoding : utf-8 -*- module RademadeAdmin - class ForgotPasswordsController < RademadeAdmin::AbstractController + class ForgotPasswordsController < RademadeAdmin::ApplicationController layout 'login' diff --git a/app/controllers/rademade_admin/gallery_controller.rb b/app/controllers/rademade_admin/gallery_controller.rb index 07786fac..223c46a6 100644 --- a/app/controllers/rademade_admin/gallery_controller.rb +++ b/app/controllers/rademade_admin/gallery_controller.rb @@ -1,5 +1,5 @@ # -*- encoding : utf-8 -*- -class RademadeAdmin::GalleryController < RademadeAdmin::AbstractController +class RademadeAdmin::GalleryController < RademadeAdmin::ApplicationController def upload render :json => { @@ -44,4 +44,4 @@ def gallery_service @gallery_service ||= RademadeAdmin::Gallery::Manager.new(params[:class_name]) end -end \ No newline at end of file +end diff --git a/app/controllers/rademade_admin/model_controller.rb b/app/controllers/rademade_admin/model_controller.rb index 340f01b6..95df4078 100644 --- a/app/controllers/rademade_admin/model_controller.rb +++ b/app/controllers/rademade_admin/model_controller.rb @@ -1,13 +1,13 @@ # -*- encoding : utf-8 -*- # todo extract more modules module RademadeAdmin - class ModelController < RademadeAdmin::AbstractController + class ModelController < RademadeAdmin::ApplicationController - extend RademadeAdmin::ModelOptions + extend RademadeAdmin::ModelControllerModules::ModelOptions - include RademadeAdmin::InstanceOptions - include RademadeAdmin::Templates - include RademadeAdmin::Notifier + include RademadeAdmin::ModelControllerModules::InstanceOptions + include RademadeAdmin::ModelControllerModules::Templates + include RademadeAdmin::ModelControllerModules::Notifier helper RademadeAdmin::FieldHelper helper RademadeAdmin::FieldTypeHelper @@ -172,4 +172,4 @@ def autocomplete_serializer end end -end \ No newline at end of file +end diff --git a/app/controllers/rademade_admin/reset_passwords_controller.rb b/app/controllers/rademade_admin/reset_passwords_controller.rb index 92992ff1..bc2c95a0 100644 --- a/app/controllers/rademade_admin/reset_passwords_controller.rb +++ b/app/controllers/rademade_admin/reset_passwords_controller.rb @@ -1,6 +1,6 @@ # -*- encoding : utf-8 -*- module RademadeAdmin - class ResetPasswordsController < RademadeAdmin::AbstractController + class ResetPasswordsController < RademadeAdmin::ApplicationController layout 'login' diff --git a/app/controllers/rademade_admin/sessions_controller.rb b/app/controllers/rademade_admin/sessions_controller.rb index d3ab0cbf..00b112c8 100644 --- a/app/controllers/rademade_admin/sessions_controller.rb +++ b/app/controllers/rademade_admin/sessions_controller.rb @@ -1,6 +1,6 @@ # -*- encoding : utf-8 -*- module RademadeAdmin - class SessionsController < RademadeAdmin::AbstractController + class SessionsController < RademadeAdmin::ApplicationController skip_before_action :require_login diff --git a/app/controllers/rademade_admin/status_controller.rb b/app/controllers/rademade_admin/status_controller.rb index 972dec26..e969ff0b 100644 --- a/app/controllers/rademade_admin/status_controller.rb +++ b/app/controllers/rademade_admin/status_controller.rb @@ -1,8 +1,8 @@ # -*- encoding : utf-8 -*- module RademadeAdmin - class StatusController < RademadeAdmin::AbstractController + class StatusController < RademadeAdmin::ApplicationController - include RademadeAdmin::Notifier + include RademadeAdmin::ModelControllerModules::Notifier def toggle authorize! :update, params[:model] @@ -13,4 +13,4 @@ def toggle end end -end \ No newline at end of file +end diff --git a/app/inputs/rademade_admin/related_select_input.rb b/app/inputs/rademade_admin/related_select_input.rb index 3527b47d..1d372a6e 100644 --- a/app/inputs/rademade_admin/related_select_input.rb +++ b/app/inputs/rademade_admin/related_select_input.rb @@ -1,13 +1,10 @@ # -*- encoding : utf-8 -*- -require 'rademade_admin/input/related_select_input/model_data' -require 'rademade_admin/input/related_select_input/related_list' - module RademadeAdmin class RelatedSelectInput < SimpleForm::Inputs::CollectionSelectInput include ::RademadeAdmin::UriHelper - include ::RademadeAdmin::Input::RelatedSelectInput::ModelData - include ::RademadeAdmin::Input::RelatedSelectInput::RelatedList + include ::RademadeAdmin::RelatedSelectInput::ModelData + include ::RademadeAdmin::RelatedSelectInput::RelatedList def input(wrapper_options = {}) RademadeAdmin::HtmlBuffer.new([select_ui_html, related_html]) diff --git a/app/inputs/rademade_admin/related_select_input/model_data.rb b/app/inputs/rademade_admin/related_select_input/model_data.rb new file mode 100644 index 00000000..d527c19c --- /dev/null +++ b/app/inputs/rademade_admin/related_select_input/model_data.rb @@ -0,0 +1,38 @@ +# -*- encoding : utf-8 -*- +module RademadeAdmin + class RelatedSelectInput + module ModelData + + protected + + def model + @model ||= @builder.object + end + + def related_data_item + unless @related_data_item + model_info = Model::Graph.instance.model_info(model.class) + @related_data_item = model_info.data_items.data_item(attribute_name) + end + @related_data_item + end + + def related_to + related_data_item.relation.to || related_value.class + end + + def relation_getter + related_data_item.getter + end + + def multiple? + related_data_item.relation.has_many? + end + + def related_value + @related_value ||= model.send(relation_getter) + end + + end + end +end diff --git a/app/inputs/rademade_admin/related_select_input/related_list.rb b/app/inputs/rademade_admin/related_select_input/related_list.rb new file mode 100644 index 00000000..734ab214 --- /dev/null +++ b/app/inputs/rademade_admin/related_select_input/related_list.rb @@ -0,0 +1,74 @@ +# -*- encoding : utf-8 -*- +module RademadeAdmin + class RelatedSelectInput + module RelatedList + + protected + + def related_list_html + template.content_tag(:ul, related_list_items_html, { + :class => 'select2-items-list', + :data => { + :sortable => sortable_relation?, + :deletable => destroyable_relation?, + :duplicatable => options[:duplicatable] + } + }) + end + + def related_list_items_html + serialized_values = serializer.new(related_value).as_json + html = serialized_values.map do |serialized_value| + template.content_tag(:li, related_list_item_html(serialized_value), { + :'data-id' => serialized_value[:id], + :class => related_item_class + }) + end + RademadeAdmin::HtmlBuffer.new(html) + end + + def related_list_item_html(serialized_value) + RademadeAdmin::HtmlBuffer.new([ + draggable_button_html, + related_list_item_title_html(serialized_value), + related_list_item_remove_html + ]) + end + + def draggable_button_html + template.content_tag(:i, '', { + :class => 'draggable-btn' + }) if sortable_relation? + end + + def related_list_item_title_html(serialized_value) + template.content_tag(:button, serialized_value[:text], { + :'data-edit' => serialized_value[:editurl], + :class => 'select2-item-edit' + }) + end + + def related_list_item_remove_html + template.content_tag(:button, I18n.t('rademade_admin.relation.destroy'), { + :'data-remove' => '', + :class => 'select2-item-remove' + }) if destroyable_relation? + end + + def related_item_class + class_name = 'select2-item' + class_name += ' is-draggable' if sortable_relation? + class_name + end + + def sortable_relation? + related_data_item.relation.sortable? + end + + def destroyable_relation? + related_data_item.relation.destroyable? + end + + end + end +end diff --git a/app/services/model_controller/instance_options.rb b/app/services/model_controller/instance_options.rb deleted file mode 100644 index e1e43af4..00000000 --- a/app/services/model_controller/instance_options.rb +++ /dev/null @@ -1,46 +0,0 @@ -# -*- encoding : utf-8 -*- -module RademadeAdmin - module InstanceOptions - - attr_reader :model_info, - :model_class, - :model_name, - :item_name, - :list_fields, - # TODO form_fields refactor - :form_fields_without_locale, - :form_fields_with_locale - - def load_model_options - @model_info = self.class.model_info - @model_name = self.class.model_name - @model_class = self.class.model_class - @item_name = self.class.item_name - end - - def load_field_options - @list_fields = @model_info.data_items.list_fields - @form_fields_without_locale = @model_info.data_items.form_fields_without_locale - @form_fields_with_locale = @model_info.data_items.form_fields_with_locale - end - - def origin_fields - @model_info.data_items.origin_fields - end - - def filter_fields - @model_info.data_items.filter_fields - end - - def load_template_options - @form_template_path ||= form_template_path - end - - def load_options - load_model_options - load_field_options - load_template_options - end - - end -end diff --git a/app/services/model_controller/model_options.rb b/app/services/model_controller/model_options.rb deleted file mode 100644 index 485dad22..00000000 --- a/app/services/model_controller/model_options.rb +++ /dev/null @@ -1,49 +0,0 @@ -# -*- encoding : utf-8 -*- -module RademadeAdmin - module ModelOptions - - # Configure admin part of model - # Support options - # - model - # - name - # - parent_menu (todo extract to menu method) - # - fixed_thead - # - menu_count - # - list - # - form - # - labels - # - def options(&options_block) - configuration.instance_eval &options_block - end - - def model_name - configuration.model_name - end - - def item_name - configuration.item_name - end - - def parent_menu_item - configuration.parent_menu_item - end - - def fixed_thead_value - configuration.fixed_thead_value - end - - def model_class - configuration.model_class - end - - def model_info - @model_info ||= Model::Graph.instance.model_info(model_class) - end - - def configuration - @configuration ||= Model::Configuration.new(self) - end - - end -end diff --git a/app/services/model_controller/notifier.rb b/app/services/model_controller/notifier.rb deleted file mode 100644 index 1e7342f3..00000000 --- a/app/services/model_controller/notifier.rb +++ /dev/null @@ -1,61 +0,0 @@ -# -*- encoding : utf-8 -*- -module RademadeAdmin - module Notifier - - # TODO use responder (respond with) - - def success_action - render :json => { - :message => I18n.t('rademade_admin.success_message.simple') - } - end - - def success_insert(item) - respond_to do |format| - format.html { redirect_to admin_edit_uri(item) } - format.json { success_message(item, I18n.t('rademade_admin.success_message.insert'), success_data(item)) } - end - end - - def success_update(item) - respond_to do |format| - format.html { redirect_to admin_edit_uri(item) } - format.json { success_message(item, I18n.t('rademade_admin.success_message.update'), success_data(item)) } - end - end - - def success_delete(item) - respond_to do |format| - format.html { redirect_to admin_list_uri(item) } - format.json { success_message(item, I18n.t('rademade_admin.success_message.delete')) } - end - end - - def success_status_change(item) - respond_to do |format| - format.html { redirect_to admin_list_uri(item) } - format.json { success_message(item, t('rademade_admin.success_message.status_update')) } - end - end - - def success_message(item, message, additional_data = {}) - render :json => { - :data => notifier_serializer.new([item]).as_json.first, - :message => message - }.merge(additional_data) - end - - def success_data(item) - if params.has_key?(:save_and_return) - { :with_return => true } - else - { :form_action => admin_update_uri(item) } # TODO check JS. Rename for update - end - end - - def notifier_serializer - Autocomplete::BaseSerializer - end - - end -end \ No newline at end of file diff --git a/app/services/model_controller/templates.rb b/app/services/model_controller/templates.rb deleted file mode 100644 index 044f8ca4..00000000 --- a/app/services/model_controller/templates.rb +++ /dev/null @@ -1,24 +0,0 @@ -# -*- encoding : utf-8 -*- -module RademadeAdmin - module Templates - - def native_template_folder - # e.g. RademadeAdmin::QuestionAnswer::UsersController to "rademade_admin/question_answer/users" - @native_template_folder ||= self.class.to_s.gsub('Controller', '').underscore - end - - def form_template_path(real = false) - abstract_template((real ? '_' : '') + 'form') - end - - def abstract_template(template) - # TODO make with rails native controller extending - if template_exists?(template, native_template_folder) - "#{native_template_folder}/#{template}" - else - @template_service.template_path('abstract', template) - end - end - - end -end diff --git a/app/services/csv_service.rb b/app/services/rademade_admin/csv_service.rb similarity index 100% rename from app/services/csv_service.rb rename to app/services/rademade_admin/csv_service.rb diff --git a/app/services/error_service.rb b/app/services/rademade_admin/error_service.rb similarity index 100% rename from app/services/error_service.rb rename to app/services/rademade_admin/error_service.rb diff --git a/app/services/gallery/manager.rb b/app/services/rademade_admin/gallery/manager.rb similarity index 100% rename from app/services/gallery/manager.rb rename to app/services/rademade_admin/gallery/manager.rb diff --git a/app/services/loader_service.rb b/app/services/rademade_admin/loader_service.rb similarity index 100% rename from app/services/loader_service.rb rename to app/services/rademade_admin/loader_service.rb diff --git a/app/services/login.rb b/app/services/rademade_admin/login.rb similarity index 100% rename from app/services/login.rb rename to app/services/rademade_admin/login.rb diff --git a/app/services/login/error.rb b/app/services/rademade_admin/login/error.rb similarity index 100% rename from app/services/login/error.rb rename to app/services/rademade_admin/login/error.rb diff --git a/app/services/rademade_admin/model_controller_modules/instance_options.rb b/app/services/rademade_admin/model_controller_modules/instance_options.rb new file mode 100644 index 00000000..2da94afe --- /dev/null +++ b/app/services/rademade_admin/model_controller_modules/instance_options.rb @@ -0,0 +1,48 @@ +# -*- encoding : utf-8 -*- +module RademadeAdmin + module ModelControllerModules + module InstanceOptions + + attr_reader :model_info, + :model_class, + :model_name, + :item_name, + :list_fields, + # TODO form_fields refactor + :form_fields_without_locale, + :form_fields_with_locale + + def load_model_options + @model_info = self.class.model_info + @model_name = self.class.model_name + @model_class = self.class.model_class + @item_name = self.class.item_name + end + + def load_field_options + @list_fields = @model_info.data_items.list_fields + @form_fields_without_locale = @model_info.data_items.form_fields_without_locale + @form_fields_with_locale = @model_info.data_items.form_fields_with_locale + end + + def origin_fields + @model_info.data_items.origin_fields + end + + def filter_fields + @model_info.data_items.filter_fields + end + + def load_template_options + @form_template_path ||= form_template_path + end + + def load_options + load_model_options + load_field_options + load_template_options + end + + end + end +end diff --git a/app/services/rademade_admin/model_controller_modules/model_options.rb b/app/services/rademade_admin/model_controller_modules/model_options.rb new file mode 100644 index 00000000..513c040c --- /dev/null +++ b/app/services/rademade_admin/model_controller_modules/model_options.rb @@ -0,0 +1,51 @@ +# -*- encoding : utf-8 -*- +module RademadeAdmin + module ModelControllerModules + module ModelOptions + + # Configure admin part of model + # Support options + # - model + # - name + # - parent_menu (todo extract to menu method) + # - fixed_thead + # - menu_count + # - list + # - form + # - labels + # + def options(&options_block) + configuration.instance_eval &options_block + end + + def model_name + configuration.model_name + end + + def item_name + configuration.item_name + end + + def parent_menu_item + configuration.parent_menu_item + end + + def fixed_thead_value + configuration.fixed_thead_value + end + + def model_class + configuration.model_class + end + + def model_info + @model_info ||= ::RademadeAdmin::Model::Graph.instance.model_info(model_class) + end + + def configuration + @configuration ||= ::RademadeAdmin::Model::Configuration.new(self) + end + + end + end +end diff --git a/app/services/rademade_admin/model_controller_modules/notifier.rb b/app/services/rademade_admin/model_controller_modules/notifier.rb new file mode 100644 index 00000000..3af6c843 --- /dev/null +++ b/app/services/rademade_admin/model_controller_modules/notifier.rb @@ -0,0 +1,63 @@ +# -*- encoding : utf-8 -*- +module RademadeAdmin + module ModelControllerModules + module Notifier + + # TODO use responder (respond with) + + def success_action + render :json => { + :message => I18n.t('rademade_admin.success_message.simple') + } + end + + def success_insert(item) + respond_to do |format| + format.html { redirect_to admin_edit_uri(item) } + format.json { success_message(item, I18n.t('rademade_admin.success_message.insert'), success_data(item)) } + end + end + + def success_update(item) + respond_to do |format| + format.html { redirect_to admin_edit_uri(item) } + format.json { success_message(item, I18n.t('rademade_admin.success_message.update'), success_data(item)) } + end + end + + def success_delete(item) + respond_to do |format| + format.html { redirect_to admin_list_uri(item) } + format.json { success_message(item, I18n.t('rademade_admin.success_message.delete')) } + end + end + + def success_status_change(item) + respond_to do |format| + format.html { redirect_to admin_list_uri(item) } + format.json { success_message(item, t('rademade_admin.success_message.status_update')) } + end + end + + def success_message(item, message, additional_data = {}) + render :json => { + :data => notifier_serializer.new([item]).as_json.first, + :message => message + }.merge(additional_data) + end + + def success_data(item) + if params.has_key?(:save_and_return) + { :with_return => true } + else + { :form_action => admin_update_uri(item) } # TODO check JS. Rename for update + end + end + + def notifier_serializer + Autocomplete::BaseSerializer + end + + end + end +end diff --git a/app/services/rademade_admin/model_controller_modules/templates.rb b/app/services/rademade_admin/model_controller_modules/templates.rb new file mode 100644 index 00000000..7f13cb45 --- /dev/null +++ b/app/services/rademade_admin/model_controller_modules/templates.rb @@ -0,0 +1,26 @@ +# -*- encoding : utf-8 -*- +module RademadeAdmin + module ModelControllerModules + module Templates + + def native_template_folder + # e.g. RademadeAdmin::QuestionAnswer::UsersController to "rademade_admin/question_answer/users" + @native_template_folder ||= self.class.to_s.gsub('Controller', '').underscore + end + + def form_template_path(real = false) + abstract_template((real ? '_' : '') + 'form') + end + + def abstract_template(template) + # TODO make with rails native controller extending + if template_exists?(template, native_template_folder) + "#{native_template_folder}/#{template}" + else + @template_service.template_path('abstract', template) + end + end + + end + end +end diff --git a/app/services/reset_password.rb b/app/services/rademade_admin/reset_password.rb similarity index 99% rename from app/services/reset_password.rb rename to app/services/rademade_admin/reset_password.rb index 3ea67998..0761a0c9 100644 --- a/app/services/reset_password.rb +++ b/app/services/rademade_admin/reset_password.rb @@ -3,6 +3,7 @@ module RademadeAdmin class ResetPassword MIN_PASSWORD_LENGTH = 6 + def self.call(password:, password_repeat:, user:) error(I18n.t('rademade_admin.login.validation.password_length', length: MIN_PASSWORD_LENGTH), :password) if password.length < MIN_PASSWORD_LENGTH error(I18n.t('rademade_admin.login.validation.password_not_match'), :password_repeat) if password != password_repeat diff --git a/app/services/saver.rb b/app/services/rademade_admin/saver.rb similarity index 100% rename from app/services/saver.rb rename to app/services/rademade_admin/saver.rb diff --git a/app/services/search/conditions/abstract.rb b/app/services/rademade_admin/search/conditions/abstract.rb similarity index 100% rename from app/services/search/conditions/abstract.rb rename to app/services/rademade_admin/search/conditions/abstract.rb diff --git a/app/services/search/conditions/autocomplete.rb b/app/services/rademade_admin/search/conditions/autocomplete.rb similarity index 94% rename from app/services/search/conditions/autocomplete.rb rename to app/services/rademade_admin/search/conditions/autocomplete.rb index d38ab689..8faaf088 100644 --- a/app/services/search/conditions/autocomplete.rb +++ b/app/services/rademade_admin/search/conditions/autocomplete.rb @@ -1,7 +1,4 @@ # -*- encoding : utf-8 -*- -require 'search/conditions/abstract' -require 'search/where' - module RademadeAdmin module Search module Conditions diff --git a/app/services/search/conditions/list.rb b/app/services/rademade_admin/search/conditions/list.rb similarity index 94% rename from app/services/search/conditions/list.rb rename to app/services/rademade_admin/search/conditions/list.rb index bdd1f560..028ec8f1 100644 --- a/app/services/search/conditions/list.rb +++ b/app/services/rademade_admin/search/conditions/list.rb @@ -1,7 +1,4 @@ # -*- encoding : utf-8 -*- -require 'search/conditions/abstract' -require 'search/where' - module RademadeAdmin module Search module Conditions @@ -52,4 +49,4 @@ def search_by_fields end end end -end \ No newline at end of file +end diff --git a/app/services/search/part/abstract.rb b/app/services/rademade_admin/search/part/abstract.rb similarity index 100% rename from app/services/search/part/abstract.rb rename to app/services/rademade_admin/search/part/abstract.rb diff --git a/app/services/search/part/order.rb b/app/services/rademade_admin/search/part/order.rb similarity index 88% rename from app/services/search/part/order.rb rename to app/services/rademade_admin/search/part/order.rb index 34fa97ff..72147e29 100644 --- a/app/services/search/part/order.rb +++ b/app/services/rademade_admin/search/part/order.rb @@ -1,6 +1,4 @@ # -*- encoding : utf-8 -*- -require 'search/part/abstract' - module RademadeAdmin module Search module Part @@ -16,4 +14,4 @@ def part_object(field, value) end end end -end \ No newline at end of file +end diff --git a/app/services/search/part/where.rb b/app/services/rademade_admin/search/part/where.rb similarity index 88% rename from app/services/search/part/where.rb rename to app/services/rademade_admin/search/part/where.rb index 57c26704..f66d8afe 100644 --- a/app/services/search/part/where.rb +++ b/app/services/rademade_admin/search/part/where.rb @@ -1,6 +1,4 @@ # -*- encoding : utf-8 -*- -require 'search/part/abstract' - module RademadeAdmin module Search module Part diff --git a/app/services/search/where.rb b/app/services/rademade_admin/search/where.rb similarity index 100% rename from app/services/search/where.rb rename to app/services/rademade_admin/search/where.rb diff --git a/app/services/sortable_service.rb b/app/services/rademade_admin/sortable_service.rb similarity index 100% rename from app/services/sortable_service.rb rename to app/services/rademade_admin/sortable_service.rb diff --git a/app/services/status/toggler.rb b/app/services/rademade_admin/status/toggler.rb similarity index 100% rename from app/services/status/toggler.rb rename to app/services/rademade_admin/status/toggler.rb diff --git a/app/services/template_service.rb b/app/services/rademade_admin/template_service.rb similarity index 100% rename from app/services/template_service.rb rename to app/services/rademade_admin/template_service.rb diff --git a/app/services/upload/image_presenter.rb b/app/services/rademade_admin/upload/image_presenter.rb similarity index 100% rename from app/services/upload/image_presenter.rb rename to app/services/rademade_admin/upload/image_presenter.rb diff --git a/app/services/upload/preview.rb b/app/services/rademade_admin/upload/preview.rb similarity index 100% rename from app/services/upload/preview.rb rename to app/services/rademade_admin/upload/preview.rb diff --git a/app/services/upload/preview/file.rb b/app/services/rademade_admin/upload/preview/file.rb similarity index 100% rename from app/services/upload/preview/file.rb rename to app/services/rademade_admin/upload/preview/file.rb diff --git a/app/services/upload/preview/gallery.rb b/app/services/rademade_admin/upload/preview/gallery.rb similarity index 100% rename from app/services/upload/preview/gallery.rb rename to app/services/rademade_admin/upload/preview/gallery.rb diff --git a/app/services/user_password_token.rb b/app/services/rademade_admin/user_password_token.rb similarity index 100% rename from app/services/user_password_token.rb rename to app/services/rademade_admin/user_password_token.rb diff --git a/app/services/video_service.rb b/app/services/rademade_admin/video_service.rb similarity index 100% rename from app/services/video_service.rb rename to app/services/rademade_admin/video_service.rb diff --git a/lib/rademade_admin/engine.rb b/lib/rademade_admin/engine.rb index 1f9a5222..0fdb0237 100644 --- a/lib/rademade_admin/engine.rb +++ b/lib/rademade_admin/engine.rb @@ -1,5 +1,4 @@ # -*- encoding : utf-8 -*- -require 'rademade_admin/routing/mapper' require 'simple_form' require 'select2-rails' require 'carrierwave' @@ -30,18 +29,10 @@ class Engine < ::Rails::Engine app.config.assets.precompile += %w(rademade_admin.css rademade_admin.js rademade_admin/fav1.ico) end - $LOAD_PATH << "#{config.root}/app/services/" - - paths = %W( - #{config.root}/app/helpers/**/*.rb - #{config.root}/app/services/**/*.rb - #{config.root}/app/inputs/**/*.rb - #{config.root}/lib/rademade_admin/**/*.rb - ) - - paths.each do |path| - Dir[path].each { |f| require f } - end + config.autoload_paths += Dir["#{config.root}/lib/**/"] + config.autoload_paths += Dir["#{config.root}/app/services/**/"] + config.autoload_paths += Dir["#{config.root}/app/helpers/**/"] + config.autoload_paths += Dir["#{config.root}/app/inputs/**/"] end end diff --git a/lib/rademade_admin/input/related_select_input/model_data.rb b/lib/rademade_admin/input/related_select_input/model_data.rb deleted file mode 100644 index 6fcbfd11..00000000 --- a/lib/rademade_admin/input/related_select_input/model_data.rb +++ /dev/null @@ -1,40 +0,0 @@ -# -*- encoding : utf-8 -*- -module RademadeAdmin - module Input - class RelatedSelectInput - module ModelData - - protected - - def model - @model ||= @builder.object - end - - def related_data_item - unless @related_data_item - model_info = Model::Graph.instance.model_info(model.class) - @related_data_item = model_info.data_items.data_item(attribute_name) - end - @related_data_item - end - - def related_to - related_data_item.relation.to || related_value.class - end - - def relation_getter - related_data_item.getter - end - - def multiple? - related_data_item.relation.has_many? - end - - def related_value - @related_value ||= model.send(relation_getter) - end - - end - end - end -end \ No newline at end of file diff --git a/lib/rademade_admin/input/related_select_input/related_list.rb b/lib/rademade_admin/input/related_select_input/related_list.rb deleted file mode 100644 index 7335cb40..00000000 --- a/lib/rademade_admin/input/related_select_input/related_list.rb +++ /dev/null @@ -1,76 +0,0 @@ -# -*- encoding : utf-8 -*- -module RademadeAdmin - module Input - class RelatedSelectInput - module RelatedList - - protected - - def related_list_html - template.content_tag(:ul, related_list_items_html, { - :class => 'select2-items-list', - :data => { - :sortable => sortable_relation?, - :deletable => destroyable_relation?, - :duplicatable => options[:duplicatable] - } - }) - end - - def related_list_items_html - serialized_values = serializer.new(related_value).as_json - html = serialized_values.map do |serialized_value| - template.content_tag(:li, related_list_item_html(serialized_value), { - :'data-id' => serialized_value[:id], - :class => related_item_class - }) - end - RademadeAdmin::HtmlBuffer.new(html) - end - - def related_list_item_html(serialized_value) - RademadeAdmin::HtmlBuffer.new([ - draggable_button_html, - related_list_item_title_html(serialized_value), - related_list_item_remove_html - ]) - end - - def draggable_button_html - template.content_tag(:i, '', { - :class => 'draggable-btn' - }) if sortable_relation? - end - - def related_list_item_title_html(serialized_value) - template.content_tag(:button, serialized_value[:text], { - :'data-edit' => serialized_value[:editurl], - :class => 'select2-item-edit' - }) - end - - def related_list_item_remove_html - template.content_tag(:button, I18n.t('rademade_admin.relation.destroy'), { - :'data-remove' => '', - :class => 'select2-item-remove' - }) if destroyable_relation? - end - - def related_item_class - class_name = 'select2-item' - class_name += ' is-draggable' if sortable_relation? - class_name - end - - def sortable_relation? - related_data_item.relation.sortable? - end - - def destroyable_relation? - related_data_item.relation.destroyable? - end - - end - end - end -end \ No newline at end of file diff --git a/lib/rademade_admin/model/adapter/data/active_record.rb b/lib/rademade_admin/model/adapter/data/active_record_data.rb similarity index 98% rename from lib/rademade_admin/model/adapter/data/active_record.rb rename to lib/rademade_admin/model/adapter/data/active_record_data.rb index 0be0749e..523a7017 100644 --- a/lib/rademade_admin/model/adapter/data/active_record.rb +++ b/lib/rademade_admin/model/adapter/data/active_record_data.rb @@ -3,7 +3,7 @@ module RademadeAdmin module Model module Adapter class Data - class ActiveRecord < RademadeAdmin::Model::Adapter::Data + class ActiveRecordData < RademadeAdmin::Model::Adapter::Data protected @@ -145,4 +145,4 @@ def datetime_type?(field_data) end end end -end \ No newline at end of file +end diff --git a/lib/rademade_admin/model/adapter/data/mongoid.rb b/lib/rademade_admin/model/adapter/data/mongoid_data.rb similarity index 97% rename from lib/rademade_admin/model/adapter/data/mongoid.rb rename to lib/rademade_admin/model/adapter/data/mongoid_data.rb index de36c6e6..a8f237fa 100644 --- a/lib/rademade_admin/model/adapter/data/mongoid.rb +++ b/lib/rademade_admin/model/adapter/data/mongoid_data.rb @@ -3,7 +3,7 @@ module RademadeAdmin module Model module Adapter class Data - class Mongoid < RademadeAdmin::Model::Adapter::Data + class MongoidData < RademadeAdmin::Model::Adapter::Data protected @@ -65,7 +65,7 @@ def _relation_destroyable? def _model_fields @model.fields.keys.map(&:to_sym) end - + private def field_type(type) @@ -85,4 +85,4 @@ def field_type(type) end end end -end \ No newline at end of file +end diff --git a/lib/rademade_admin/model/adapter/data/sequel.rb b/lib/rademade_admin/model/adapter/data/sequel_data.rb similarity index 98% rename from lib/rademade_admin/model/adapter/data/sequel.rb rename to lib/rademade_admin/model/adapter/data/sequel_data.rb index 5efa760b..f29f437a 100644 --- a/lib/rademade_admin/model/adapter/data/sequel.rb +++ b/lib/rademade_admin/model/adapter/data/sequel_data.rb @@ -3,7 +3,7 @@ module RademadeAdmin module Model module Adapter class Data - class Sequel < RademadeAdmin::Model::Adapter::Data + class SequelData < RademadeAdmin::Model::Adapter::Data protected @@ -99,4 +99,4 @@ def field_type(type) end end end -end \ No newline at end of file +end diff --git a/lib/rademade_admin/model/adapter/persistence/mongoid.rb b/lib/rademade_admin/model/adapter/persistence/active_record_persistence.rb similarity index 76% rename from lib/rademade_admin/model/adapter/persistence/mongoid.rb rename to lib/rademade_admin/model/adapter/persistence/active_record_persistence.rb index 8d71ccd7..2d76c3be 100644 --- a/lib/rademade_admin/model/adapter/persistence/mongoid.rb +++ b/lib/rademade_admin/model/adapter/persistence/active_record_persistence.rb @@ -3,7 +3,7 @@ module RademadeAdmin module Model module Adapter class Persistence - class Mongoid < RademadeAdmin::Model::Adapter::Persistence + class ActiveRecordPersistence < RademadeAdmin::Model::Adapter::Persistence def new?(record) record.new_record? @@ -17,4 +17,4 @@ def save(record) end end end -end \ No newline at end of file +end diff --git a/lib/rademade_admin/model/adapter/persistence/active_record.rb b/lib/rademade_admin/model/adapter/persistence/mongoid_persistence.rb similarity index 77% rename from lib/rademade_admin/model/adapter/persistence/active_record.rb rename to lib/rademade_admin/model/adapter/persistence/mongoid_persistence.rb index 92684db9..6c196af0 100644 --- a/lib/rademade_admin/model/adapter/persistence/active_record.rb +++ b/lib/rademade_admin/model/adapter/persistence/mongoid_persistence.rb @@ -3,7 +3,7 @@ module RademadeAdmin module Model module Adapter class Persistence - class ActiveRecord < RademadeAdmin::Model::Adapter::Persistence + class MongoidPersistence < RademadeAdmin::Model::Adapter::Persistence def new?(record) record.new_record? @@ -17,4 +17,4 @@ def save(record) end end end -end \ No newline at end of file +end diff --git a/lib/rademade_admin/model/adapter/persistence/sequel.rb b/lib/rademade_admin/model/adapter/persistence/sequel_persistence.rb similarity index 77% rename from lib/rademade_admin/model/adapter/persistence/sequel.rb rename to lib/rademade_admin/model/adapter/persistence/sequel_persistence.rb index 3329ccc9..7430722c 100644 --- a/lib/rademade_admin/model/adapter/persistence/sequel.rb +++ b/lib/rademade_admin/model/adapter/persistence/sequel_persistence.rb @@ -3,7 +3,7 @@ module RademadeAdmin module Model module Adapter class Persistence - class Sequel < RademadeAdmin::Model::Adapter::Persistence + class SequelPersistence < RademadeAdmin::Model::Adapter::Persistence def new?(record) record.new? @@ -17,4 +17,4 @@ def save(record) end end end -end \ No newline at end of file +end diff --git a/lib/rademade_admin/model/adapter/query/active_record.rb b/lib/rademade_admin/model/adapter/query/active_record_query.rb similarity index 86% rename from lib/rademade_admin/model/adapter/query/active_record.rb rename to lib/rademade_admin/model/adapter/query/active_record_query.rb index aebc8591..2faae233 100644 --- a/lib/rademade_admin/model/adapter/query/active_record.rb +++ b/lib/rademade_admin/model/adapter/query/active_record_query.rb @@ -1,11 +1,9 @@ # -*- encoding : utf-8 -*- -require 'rademade_admin/model/adapter/query/sql' - module RademadeAdmin module Model module Adapter class Query - class ActiveRecord < RademadeAdmin::Model::Adapter::Query::Sql + class ActiveRecordQuery < RademadeAdmin::Model::Adapter::Query::SqlQuery def find(ids) @model.find(ids) @@ -36,4 +34,4 @@ def paginate(page_condition, per_page_condition) end end end -end \ No newline at end of file +end diff --git a/lib/rademade_admin/model/adapter/query/mongoid.rb b/lib/rademade_admin/model/adapter/query/mongoid_query.rb similarity index 96% rename from lib/rademade_admin/model/adapter/query/mongoid.rb rename to lib/rademade_admin/model/adapter/query/mongoid_query.rb index 945987e0..5677fa09 100644 --- a/lib/rademade_admin/model/adapter/query/mongoid.rb +++ b/lib/rademade_admin/model/adapter/query/mongoid_query.rb @@ -3,7 +3,7 @@ module RademadeAdmin module Model module Adapter class Query - class Mongoid < RademadeAdmin::Model::Adapter::Query + class MongoidQuery < RademadeAdmin::Model::Adapter::Query def find(ids) @model.find(ids) diff --git a/lib/rademade_admin/model/adapter/query/mysql.rb b/lib/rademade_admin/model/adapter/query/mysql_query.rb similarity index 50% rename from lib/rademade_admin/model/adapter/query/mysql.rb rename to lib/rademade_admin/model/adapter/query/mysql_query.rb index 2c6e1e3a..59623973 100644 --- a/lib/rademade_admin/model/adapter/query/mysql.rb +++ b/lib/rademade_admin/model/adapter/query/mysql_query.rb @@ -1,14 +1,12 @@ # -*- encoding : utf-8 -*- -require 'rademade_admin/model/adapter/query/active_record' - module RademadeAdmin module Model module Adapter class Query - class Mysql < RademadeAdmin::Model::Adapter::Query::ActiveRecord + class MysqlQuery < RademadeAdmin::Model::Adapter::Query::ActiveRecord end end end end -end \ No newline at end of file +end diff --git a/lib/rademade_admin/model/adapter/query/postgresql.rb b/lib/rademade_admin/model/adapter/query/postgresql_query.rb similarity index 78% rename from lib/rademade_admin/model/adapter/query/postgresql.rb rename to lib/rademade_admin/model/adapter/query/postgresql_query.rb index dfc7fe79..f8bb88aa 100644 --- a/lib/rademade_admin/model/adapter/query/postgresql.rb +++ b/lib/rademade_admin/model/adapter/query/postgresql_query.rb @@ -1,11 +1,9 @@ # -*- encoding : utf-8 -*- -require 'rademade_admin/model/adapter/query/active_record' - module RademadeAdmin module Model module Adapter class Query - class Postgresql < RademadeAdmin::Model::Adapter::Query::ActiveRecord + class PostgresqlQuery < RademadeAdmin::Model::Adapter::Query::ActiveRecordQuery protected diff --git a/lib/rademade_admin/model/adapter/query/sequel.rb b/lib/rademade_admin/model/adapter/query/sequel_query.rb similarity index 90% rename from lib/rademade_admin/model/adapter/query/sequel.rb rename to lib/rademade_admin/model/adapter/query/sequel_query.rb index aa74e18e..a4176156 100644 --- a/lib/rademade_admin/model/adapter/query/sequel.rb +++ b/lib/rademade_admin/model/adapter/query/sequel_query.rb @@ -1,11 +1,9 @@ # -*- encoding : utf-8 -*- -require 'rademade_admin/model/adapter/query/sql' - module RademadeAdmin module Model module Adapter class Query - class Sequel < RademadeAdmin::Model::Adapter::Query::Sql + class SequelQuery < RademadeAdmin::Model::Adapter::Query::SqlQuery def find(ids) @model[ids] diff --git a/lib/rademade_admin/model/adapter/query/sql.rb b/lib/rademade_admin/model/adapter/query/sql_query.rb similarity index 95% rename from lib/rademade_admin/model/adapter/query/sql.rb rename to lib/rademade_admin/model/adapter/query/sql_query.rb index f76e9319..b0c63701 100644 --- a/lib/rademade_admin/model/adapter/query/sql.rb +++ b/lib/rademade_admin/model/adapter/query/sql_query.rb @@ -3,7 +3,7 @@ module RademadeAdmin module Model module Adapter class Query - class Sql < RademadeAdmin::Model::Adapter::Query + class SqlQuery < RademadeAdmin::Model::Adapter::Query protected @@ -47,4 +47,4 @@ def table_field(field) end end end -end \ No newline at end of file +end diff --git a/lib/rademade_admin/model/configuration/csv_fields.rb b/lib/rademade_admin/model/configuration/csv_fields.rb index 977f17b6..0c8e71c8 100644 --- a/lib/rademade_admin/model/configuration/csv_fields.rb +++ b/lib/rademade_admin/model/configuration/csv_fields.rb @@ -1,6 +1,4 @@ # -*- encoding : utf-8 -*- -require 'rademade_admin/model/configuration/list_fields' - module RademadeAdmin module Model class Configuration diff --git a/lib/rademade_admin/model/configuration/fields_labels.rb b/lib/rademade_admin/model/configuration/fields_labels.rb index 5142abc5..476c0230 100644 --- a/lib/rademade_admin/model/configuration/fields_labels.rb +++ b/lib/rademade_admin/model/configuration/fields_labels.rb @@ -1,6 +1,4 @@ # -*- encoding : utf-8 -*- -require 'rademade_admin/model/configuration/fields' - module RademadeAdmin module Model class Configuration diff --git a/lib/rademade_admin/model/configuration/form_fields.rb b/lib/rademade_admin/model/configuration/form_fields.rb index 80a30f7d..1194e4c6 100644 --- a/lib/rademade_admin/model/configuration/form_fields.rb +++ b/lib/rademade_admin/model/configuration/form_fields.rb @@ -1,6 +1,4 @@ # -*- encoding : utf-8 -*- -require 'rademade_admin/model/configuration/fields' - module RademadeAdmin module Model class Configuration diff --git a/lib/rademade_admin/model/configuration/list_fields.rb b/lib/rademade_admin/model/configuration/list_fields.rb index 27ceb5f3..500fa53a 100644 --- a/lib/rademade_admin/model/configuration/list_fields.rb +++ b/lib/rademade_admin/model/configuration/list_fields.rb @@ -1,6 +1,4 @@ # -*- encoding : utf-8 -*- -require 'rademade_admin/model/configuration/fields' - module RademadeAdmin module Model class Configuration diff --git a/lib/rademade_admin/model/graph.rb b/lib/rademade_admin/model/graph.rb index 4fc3974b..80133cb6 100644 --- a/lib/rademade_admin/model/graph.rb +++ b/lib/rademade_admin/model/graph.rb @@ -21,6 +21,16 @@ def add_pair(module_name, controller_name) }) end + def add_pair_lazy(module_name, controller_name) + @pairs << { module_name: module_name, controller_name: controller_name } + end + + def init_pairs + while pair = @pairs.shift + add_pair(pair[:module_name], pair[:controller_name]) + end + end + def model_info(model) model_name = model.to_s @model_infos[model_name] ||= init_model_info({ @@ -33,6 +43,7 @@ def model_info(model) def initialize @model_infos = {} + @pairs = [] end def init_model_info(model: nil, controller_name: nil, module_name: nil, controller: nil) diff --git a/lib/rademade_admin/model/reflection.rb b/lib/rademade_admin/model/reflection.rb index 128de8df..a6c996ae 100644 --- a/lib/rademade_admin/model/reflection.rb +++ b/lib/rademade_admin/model/reflection.rb @@ -19,18 +19,18 @@ def initialize(model, controller, module_name) # # @return [RademadeAdmin::Model::Adapter::Data] def data_adapter - @data_adapter ||= "RademadeAdmin::Model::Adapter::Data::#{orm_type}".constantize.new(@model) + @data_adapter ||= "RademadeAdmin::Model::Adapter::Data::#{orm_type}Data".constantize.new(@model) end # Load query adapter for current model # # @return [RademadeAdmin::Model::Adapter::Query] def query_adapter - @query_adapter ||= "RademadeAdmin::Model::Adapter::Query::#{query_adapter_type}".constantize.new(@model) + @query_adapter ||= "RademadeAdmin::Model::Adapter::Query::#{query_adapter_type}Query".constantize.new(@model) end def persistence_adapter - @persistence_adapter ||= "RademadeAdmin::Model::Adapter::Persistence::#{orm_type}".constantize.new(@model) + @persistence_adapter ||= "RademadeAdmin::Model::Adapter::Persistence::#{orm_type}Persistence".constantize.new(@model) end def hideable? @@ -68,4 +68,4 @@ def query_adapter_type end end end -end \ No newline at end of file +end diff --git a/lib/rademade_admin/routing/mapper.rb b/lib/rademade_admin/routing/mapper.rb index 600862c7..caff060d 100644 --- a/lib/rademade_admin/routing/mapper.rb +++ b/lib/rademade_admin/routing/mapper.rb @@ -36,7 +36,7 @@ def admin_resources(*resources, &block) get :form end if parent_resource.actions.include?(:show) - Model::Graph.instance.add_pair(@scope[:module], @scope[:controller]) + Model::Graph.instance.add_pair_lazy(@scope[:module], @scope[:controller]) set_member_mappings_for_resource end diff --git a/lib/rademade_admin/uploader/carrier_wave.rb b/lib/rademade_admin/uploader/carrier_wave.rb index 3ec8b849..c5e53ba3 100644 --- a/lib/rademade_admin/uploader/carrier_wave.rb +++ b/lib/rademade_admin/uploader/carrier_wave.rb @@ -1,6 +1,4 @@ # encoding: utf-8 -require 'rademade_admin/uploader/crop_photo' - module RademadeAdmin module Uploader class CarrierWave < CarrierWave::Uploader::Base diff --git a/lib/rademade_admin/uploader/crop_photo.rb b/lib/rademade_admin/uploader/crop_photo.rb index 9c1c8070..701ce11b 100644 --- a/lib/rademade_admin/uploader/crop_photo.rb +++ b/lib/rademade_admin/uploader/crop_photo.rb @@ -1,6 +1,4 @@ # -*- encoding : utf-8 -*- -require 'rademade_admin/uploader/photo' - module RademadeAdmin module Uploader module CropPhoto From 1c243de0a10f102c8ea8174328914883ccece3e4 Mon Sep 17 00:00:00 2001 From: Praffesor Date: Thu, 13 Dec 2018 18:00:51 +0200 Subject: [PATCH 036/114] fixed route reloading --- config/initializers/routes.rb | 44 ++++++++++++++++++++++- lib/rademade_admin/routing.rb | 4 --- lib/rademade_admin/routing/mapper.rb | 49 -------------------------- lib/rademade_admin/routing/resource.rb | 10 ------ 4 files changed, 43 insertions(+), 64 deletions(-) delete mode 100644 lib/rademade_admin/routing.rb delete mode 100644 lib/rademade_admin/routing/mapper.rb delete mode 100644 lib/rademade_admin/routing/resource.rb diff --git a/config/initializers/routes.rb b/config/initializers/routes.rb index ca0ad4a8..5ffe591b 100644 --- a/config/initializers/routes.rb +++ b/config/initializers/routes.rb @@ -1,4 +1,46 @@ # -*- encoding : utf-8 -*- class ActionDispatch::Routing::Mapper - include RademadeAdmin::Routing::Mapper + + def admin_resources(*resources, &block) + options = resources.extract_options!.dup + + if apply_common_behavior_for(:admin_resources, resources, options, &block) + return self + end + + with_scope_level(:resources) do + options = apply_action_options options + resource_scope(Resource.new(resources.pop, api_only?, @scope[:shallow], options)) do + yield if block_given? + + concerns(options[:concerns]) if options[:concerns] + + collection do + get :index if parent_resource.actions.include?(:index) + get :autocomplete if parent_resource.actions.include?(:autocomplete) + end + + collection do + post :create + patch :sort + end if parent_resource.actions.include?(:create) + + new do + get :new + get :form + end if parent_resource.actions.include?(:new) + + member do + get :form + end if parent_resource.actions.include?(:show) + + ::RademadeAdmin::Model::Graph.instance.add_pair_lazy(@scope[:module], @scope[:controller]) + + set_member_mappings_for_resource + end + end + + self + end + end diff --git a/lib/rademade_admin/routing.rb b/lib/rademade_admin/routing.rb deleted file mode 100644 index f4ddd381..00000000 --- a/lib/rademade_admin/routing.rb +++ /dev/null @@ -1,4 +0,0 @@ -# -*- encoding : utf-8 -*- -module RademadeAdmin::Routing - -end diff --git a/lib/rademade_admin/routing/mapper.rb b/lib/rademade_admin/routing/mapper.rb deleted file mode 100644 index caff060d..00000000 --- a/lib/rademade_admin/routing/mapper.rb +++ /dev/null @@ -1,49 +0,0 @@ -# -*- encoding : utf-8 -*- -# frozen_string_literal: true -module RademadeAdmin - module Routing - module Mapper - def admin_resources(*resources, &block) - options = resources.extract_options!.dup - - if apply_common_behavior_for(:admin_resources, resources, options, &block) - return self - end - - with_scope_level(:resources) do - options = apply_action_options options - resource_scope(Resource.new(resources.pop, api_only?, @scope[:shallow], options)) do - yield if block_given? - - concerns(options[:concerns]) if options[:concerns] - - collection do - get :index if parent_resource.actions.include?(:index) - get :autocomplete if parent_resource.actions.include?(:autocomplete) - end - - collection do - post :create - patch :sort - end if parent_resource.actions.include?(:create) - - new do - get :new - get :form - end if parent_resource.actions.include?(:new) - - member do - get :form - end if parent_resource.actions.include?(:show) - - Model::Graph.instance.add_pair_lazy(@scope[:module], @scope[:controller]) - - set_member_mappings_for_resource - end - end - - self - end - end - end -end diff --git a/lib/rademade_admin/routing/resource.rb b/lib/rademade_admin/routing/resource.rb deleted file mode 100644 index 6db7466b..00000000 --- a/lib/rademade_admin/routing/resource.rb +++ /dev/null @@ -1,10 +0,0 @@ -# -*- encoding : utf-8 -*- -module RademadeAdmin - module Routing - class Resource < ActionDispatch::Routing::Mapper::Resources::Resource - def default_actions - super + [:autocomplete] - end - end - end -end From c45254b5386f5cc12ec7400ed53d3429aea79b7b Mon Sep 17 00:00:00 2001 From: xfearx Date: Mon, 17 Dec 2018 16:03:44 +0200 Subject: [PATCH 037/114] fix module names --- app/controllers/rademade_admin/model_controller.rb | 4 ++-- .../search/conditions/{abstract.rb => abstract_conditions.rb} | 2 +- .../{autocomplete.rb => autocomplete_conditions.rb} | 2 +- .../search/conditions/{list.rb => list_conditions.rb} | 2 +- lib/rademade_admin/model/adapter/data.rb | 2 +- .../model/info/relation/{gallery.rb => gallery_relation.rb} | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename app/services/rademade_admin/search/conditions/{abstract.rb => abstract_conditions.rb} (97%) rename app/services/rademade_admin/search/conditions/{autocomplete.rb => autocomplete_conditions.rb} (94%) rename app/services/rademade_admin/search/conditions/{list.rb => list_conditions.rb} (95%) rename lib/rademade_admin/model/info/relation/{gallery.rb => gallery_relation.rb} (77%) diff --git a/app/controllers/rademade_admin/model_controller.rb b/app/controllers/rademade_admin/model_controller.rb index 95df4078..ed7c498b 100644 --- a/app/controllers/rademade_admin/model_controller.rb +++ b/app/controllers/rademade_admin/model_controller.rb @@ -106,7 +106,7 @@ def sort # TODO move to search module def index_items(with_pagination = true) - conditions = Search::Conditions::List.new(params, model_info.data_items) + conditions = Search::Conditions::ListConditions.new(params, model_info.data_items) conditions.paginate = nil unless with_pagination if params[:rel_class] && params[:rel_id] && params[:rel_getter] related_info = RademadeAdmin::Model::Graph.instance.model_info(params[:rel_class]) @@ -117,7 +117,7 @@ def index_items(with_pagination = true) end def autocomplete_items - conditions = Search::Conditions::Autocomplete.new(params, model_info.data_items) + conditions = Search::Conditions::AutocompleteConditions.new(params, model_info.data_items) Search::Searcher.new(model_info).search(conditions) end diff --git a/app/services/rademade_admin/search/conditions/abstract.rb b/app/services/rademade_admin/search/conditions/abstract_conditions.rb similarity index 97% rename from app/services/rademade_admin/search/conditions/abstract.rb rename to app/services/rademade_admin/search/conditions/abstract_conditions.rb index 29783d11..c79f4ac1 100644 --- a/app/services/rademade_admin/search/conditions/abstract.rb +++ b/app/services/rademade_admin/search/conditions/abstract_conditions.rb @@ -2,7 +2,7 @@ module RademadeAdmin module Search module Conditions - class Abstract + class AbstractConditions attr_reader :params attr_writer :base_items diff --git a/app/services/rademade_admin/search/conditions/autocomplete.rb b/app/services/rademade_admin/search/conditions/autocomplete_conditions.rb similarity index 94% rename from app/services/rademade_admin/search/conditions/autocomplete.rb rename to app/services/rademade_admin/search/conditions/autocomplete_conditions.rb index 8faaf088..9d620eb7 100644 --- a/app/services/rademade_admin/search/conditions/autocomplete.rb +++ b/app/services/rademade_admin/search/conditions/autocomplete_conditions.rb @@ -2,7 +2,7 @@ module RademadeAdmin module Search module Conditions - class Autocomplete < Abstract + class AutocompleteConditions < AbstractConditions include RademadeAdmin::Search::Where diff --git a/app/services/rademade_admin/search/conditions/list.rb b/app/services/rademade_admin/search/conditions/list_conditions.rb similarity index 95% rename from app/services/rademade_admin/search/conditions/list.rb rename to app/services/rademade_admin/search/conditions/list_conditions.rb index 028ec8f1..e901969a 100644 --- a/app/services/rademade_admin/search/conditions/list.rb +++ b/app/services/rademade_admin/search/conditions/list_conditions.rb @@ -2,7 +2,7 @@ module RademadeAdmin module Search module Conditions - class List < Abstract + class ListConditions < AbstractConditions include RademadeAdmin::Search::Where diff --git a/lib/rademade_admin/model/adapter/data.rb b/lib/rademade_admin/model/adapter/data.rb index 1127198e..27277804 100644 --- a/lib/rademade_admin/model/adapter/data.rb +++ b/lib/rademade_admin/model/adapter/data.rb @@ -123,7 +123,7 @@ def _model_fields def _relation_class_name(to_class) if !to_class.nil? && to_class.ancestors.include?(RademadeAdmin::Gallery) - ::RademadeAdmin::Model::Info::Relation::Gallery + ::RademadeAdmin::Model::Info::Relation::GalleryRelation else ::RademadeAdmin::Model::Info::Relation end diff --git a/lib/rademade_admin/model/info/relation/gallery.rb b/lib/rademade_admin/model/info/relation/gallery_relation.rb similarity index 77% rename from lib/rademade_admin/model/info/relation/gallery.rb rename to lib/rademade_admin/model/info/relation/gallery_relation.rb index 300fcc46..dac8b81c 100644 --- a/lib/rademade_admin/model/info/relation/gallery.rb +++ b/lib/rademade_admin/model/info/relation/gallery_relation.rb @@ -3,7 +3,7 @@ module RademadeAdmin module Model class Info class Relation - class Gallery < Relation + class GalleryRelation < Relation end end From fb2d1dc42d7c8bf527629891f553d03a54701d77 Mon Sep 17 00:00:00 2001 From: Praffesor Date: Mon, 17 Dec 2018 19:17:16 +0200 Subject: [PATCH 038/114] moved lib to services for autoloading, gallery relation fix --- {lib => app/services}/rademade_admin/field_error.rb | 0 {lib => app/services}/rademade_admin/gallery.rb | 0 {lib => app/services}/rademade_admin/hideable.rb | 0 {lib => app/services}/rademade_admin/html_buffer.rb | 0 {lib => app/services}/rademade_admin/model/adapter/data.rb | 0 .../rademade_admin/model/adapter/data/active_record_data.rb | 0 .../rademade_admin/model/adapter/data/mongoid_data.rb | 0 .../rademade_admin/model/adapter/data/sequel_data.rb | 0 .../services}/rademade_admin/model/adapter/persistence.rb | 0 .../model/adapter/persistence/active_record_persistence.rb | 0 .../model/adapter/persistence/mongoid_persistence.rb | 0 .../model/adapter/persistence/sequel_persistence.rb | 0 {lib => app/services}/rademade_admin/model/adapter/query.rb | 0 .../rademade_admin/model/adapter/query/active_record_query.rb | 0 .../rademade_admin/model/adapter/query/mongoid_query.rb | 0 .../rademade_admin/model/adapter/query/mysql_query.rb | 2 +- .../rademade_admin/model/adapter/query/postgresql_query.rb | 0 .../rademade_admin/model/adapter/query/sequel_query.rb | 0 .../services}/rademade_admin/model/adapter/query/sql_query.rb | 0 {lib => app/services}/rademade_admin/model/configuration.rb | 0 .../rademade_admin/model/configuration/csv_fields.rb | 0 .../rademade_admin/model/configuration/field_label.rb | 0 .../services}/rademade_admin/model/configuration/fields.rb | 0 .../rademade_admin/model/configuration/fields_labels.rb | 0 .../rademade_admin/model/configuration/form_field.rb | 0 .../rademade_admin/model/configuration/form_fields.rb | 0 .../rademade_admin/model/configuration/list_field.rb | 0 .../rademade_admin/model/configuration/list_fields.rb | 0 {lib => app/services}/rademade_admin/model/graph.rb | 0 {lib => app/services}/rademade_admin/model/info.rb | 0 {lib => app/services}/rademade_admin/model/info/data_item.rb | 4 ++-- .../rademade_admin/model/info/data_item/initializer.rb | 0 {lib => app/services}/rademade_admin/model/info/data_items.rb | 0 {lib => app/services}/rademade_admin/model/info/field.rb | 0 {lib => app/services}/rademade_admin/model/info/field/type.rb | 0 {lib => app/services}/rademade_admin/model/info/fields.rb | 0 {lib => app/services}/rademade_admin/model/info/relation.rb | 0 .../rademade_admin/model/info/relation/gallery_relation.rb | 0 {lib => app/services}/rademade_admin/model/info/relations.rb | 0 {lib => app/services}/rademade_admin/model/info/uploader.rb | 0 {lib => app/services}/rademade_admin/model/info/uploaders.rb | 0 {lib => app/services}/rademade_admin/model/reflection.rb | 0 {lib => app/services}/rademade_admin/search/searcher.rb | 0 {lib => app/services}/rademade_admin/sortable.rb | 0 {lib => app/services}/rademade_admin/uploader/carrier_wave.rb | 0 {lib => app/services}/rademade_admin/uploader/crop_photo.rb | 0 {lib => app/services}/rademade_admin/uploader/photo.rb | 0 {lib => app/services}/rademade_admin/uploader/video.rb | 0 .../user.rb => app/services/rademade_admin/user_module.rb | 0 lib/rademade_admin.rb | 4 +--- 50 files changed, 4 insertions(+), 6 deletions(-) rename {lib => app/services}/rademade_admin/field_error.rb (100%) rename {lib => app/services}/rademade_admin/gallery.rb (100%) rename {lib => app/services}/rademade_admin/hideable.rb (100%) rename {lib => app/services}/rademade_admin/html_buffer.rb (100%) rename {lib => app/services}/rademade_admin/model/adapter/data.rb (100%) rename {lib => app/services}/rademade_admin/model/adapter/data/active_record_data.rb (100%) rename {lib => app/services}/rademade_admin/model/adapter/data/mongoid_data.rb (100%) rename {lib => app/services}/rademade_admin/model/adapter/data/sequel_data.rb (100%) rename {lib => app/services}/rademade_admin/model/adapter/persistence.rb (100%) rename {lib => app/services}/rademade_admin/model/adapter/persistence/active_record_persistence.rb (100%) rename {lib => app/services}/rademade_admin/model/adapter/persistence/mongoid_persistence.rb (100%) rename {lib => app/services}/rademade_admin/model/adapter/persistence/sequel_persistence.rb (100%) rename {lib => app/services}/rademade_admin/model/adapter/query.rb (100%) rename {lib => app/services}/rademade_admin/model/adapter/query/active_record_query.rb (100%) rename {lib => app/services}/rademade_admin/model/adapter/query/mongoid_query.rb (100%) rename {lib => app/services}/rademade_admin/model/adapter/query/mysql_query.rb (91%) rename {lib => app/services}/rademade_admin/model/adapter/query/postgresql_query.rb (100%) rename {lib => app/services}/rademade_admin/model/adapter/query/sequel_query.rb (100%) rename {lib => app/services}/rademade_admin/model/adapter/query/sql_query.rb (100%) rename {lib => app/services}/rademade_admin/model/configuration.rb (100%) rename {lib => app/services}/rademade_admin/model/configuration/csv_fields.rb (100%) rename {lib => app/services}/rademade_admin/model/configuration/field_label.rb (100%) rename {lib => app/services}/rademade_admin/model/configuration/fields.rb (100%) rename {lib => app/services}/rademade_admin/model/configuration/fields_labels.rb (100%) rename {lib => app/services}/rademade_admin/model/configuration/form_field.rb (100%) rename {lib => app/services}/rademade_admin/model/configuration/form_fields.rb (100%) rename {lib => app/services}/rademade_admin/model/configuration/list_field.rb (100%) rename {lib => app/services}/rademade_admin/model/configuration/list_fields.rb (100%) rename {lib => app/services}/rademade_admin/model/graph.rb (100%) rename {lib => app/services}/rademade_admin/model/info.rb (100%) rename {lib => app/services}/rademade_admin/model/info/data_item.rb (99%) rename {lib => app/services}/rademade_admin/model/info/data_item/initializer.rb (100%) rename {lib => app/services}/rademade_admin/model/info/data_items.rb (100%) rename {lib => app/services}/rademade_admin/model/info/field.rb (100%) rename {lib => app/services}/rademade_admin/model/info/field/type.rb (100%) rename {lib => app/services}/rademade_admin/model/info/fields.rb (100%) rename {lib => app/services}/rademade_admin/model/info/relation.rb (100%) rename {lib => app/services}/rademade_admin/model/info/relation/gallery_relation.rb (100%) rename {lib => app/services}/rademade_admin/model/info/relations.rb (100%) rename {lib => app/services}/rademade_admin/model/info/uploader.rb (100%) rename {lib => app/services}/rademade_admin/model/info/uploaders.rb (100%) rename {lib => app/services}/rademade_admin/model/reflection.rb (100%) rename {lib => app/services}/rademade_admin/search/searcher.rb (100%) rename {lib => app/services}/rademade_admin/sortable.rb (100%) rename {lib => app/services}/rademade_admin/uploader/carrier_wave.rb (100%) rename {lib => app/services}/rademade_admin/uploader/crop_photo.rb (100%) rename {lib => app/services}/rademade_admin/uploader/photo.rb (100%) rename {lib => app/services}/rademade_admin/uploader/video.rb (100%) rename lib/rademade_admin/user.rb => app/services/rademade_admin/user_module.rb (100%) diff --git a/lib/rademade_admin/field_error.rb b/app/services/rademade_admin/field_error.rb similarity index 100% rename from lib/rademade_admin/field_error.rb rename to app/services/rademade_admin/field_error.rb diff --git a/lib/rademade_admin/gallery.rb b/app/services/rademade_admin/gallery.rb similarity index 100% rename from lib/rademade_admin/gallery.rb rename to app/services/rademade_admin/gallery.rb diff --git a/lib/rademade_admin/hideable.rb b/app/services/rademade_admin/hideable.rb similarity index 100% rename from lib/rademade_admin/hideable.rb rename to app/services/rademade_admin/hideable.rb diff --git a/lib/rademade_admin/html_buffer.rb b/app/services/rademade_admin/html_buffer.rb similarity index 100% rename from lib/rademade_admin/html_buffer.rb rename to app/services/rademade_admin/html_buffer.rb diff --git a/lib/rademade_admin/model/adapter/data.rb b/app/services/rademade_admin/model/adapter/data.rb similarity index 100% rename from lib/rademade_admin/model/adapter/data.rb rename to app/services/rademade_admin/model/adapter/data.rb diff --git a/lib/rademade_admin/model/adapter/data/active_record_data.rb b/app/services/rademade_admin/model/adapter/data/active_record_data.rb similarity index 100% rename from lib/rademade_admin/model/adapter/data/active_record_data.rb rename to app/services/rademade_admin/model/adapter/data/active_record_data.rb diff --git a/lib/rademade_admin/model/adapter/data/mongoid_data.rb b/app/services/rademade_admin/model/adapter/data/mongoid_data.rb similarity index 100% rename from lib/rademade_admin/model/adapter/data/mongoid_data.rb rename to app/services/rademade_admin/model/adapter/data/mongoid_data.rb diff --git a/lib/rademade_admin/model/adapter/data/sequel_data.rb b/app/services/rademade_admin/model/adapter/data/sequel_data.rb similarity index 100% rename from lib/rademade_admin/model/adapter/data/sequel_data.rb rename to app/services/rademade_admin/model/adapter/data/sequel_data.rb diff --git a/lib/rademade_admin/model/adapter/persistence.rb b/app/services/rademade_admin/model/adapter/persistence.rb similarity index 100% rename from lib/rademade_admin/model/adapter/persistence.rb rename to app/services/rademade_admin/model/adapter/persistence.rb diff --git a/lib/rademade_admin/model/adapter/persistence/active_record_persistence.rb b/app/services/rademade_admin/model/adapter/persistence/active_record_persistence.rb similarity index 100% rename from lib/rademade_admin/model/adapter/persistence/active_record_persistence.rb rename to app/services/rademade_admin/model/adapter/persistence/active_record_persistence.rb diff --git a/lib/rademade_admin/model/adapter/persistence/mongoid_persistence.rb b/app/services/rademade_admin/model/adapter/persistence/mongoid_persistence.rb similarity index 100% rename from lib/rademade_admin/model/adapter/persistence/mongoid_persistence.rb rename to app/services/rademade_admin/model/adapter/persistence/mongoid_persistence.rb diff --git a/lib/rademade_admin/model/adapter/persistence/sequel_persistence.rb b/app/services/rademade_admin/model/adapter/persistence/sequel_persistence.rb similarity index 100% rename from lib/rademade_admin/model/adapter/persistence/sequel_persistence.rb rename to app/services/rademade_admin/model/adapter/persistence/sequel_persistence.rb diff --git a/lib/rademade_admin/model/adapter/query.rb b/app/services/rademade_admin/model/adapter/query.rb similarity index 100% rename from lib/rademade_admin/model/adapter/query.rb rename to app/services/rademade_admin/model/adapter/query.rb diff --git a/lib/rademade_admin/model/adapter/query/active_record_query.rb b/app/services/rademade_admin/model/adapter/query/active_record_query.rb similarity index 100% rename from lib/rademade_admin/model/adapter/query/active_record_query.rb rename to app/services/rademade_admin/model/adapter/query/active_record_query.rb diff --git a/lib/rademade_admin/model/adapter/query/mongoid_query.rb b/app/services/rademade_admin/model/adapter/query/mongoid_query.rb similarity index 100% rename from lib/rademade_admin/model/adapter/query/mongoid_query.rb rename to app/services/rademade_admin/model/adapter/query/mongoid_query.rb diff --git a/lib/rademade_admin/model/adapter/query/mysql_query.rb b/app/services/rademade_admin/model/adapter/query/mysql_query.rb similarity index 91% rename from lib/rademade_admin/model/adapter/query/mysql_query.rb rename to app/services/rademade_admin/model/adapter/query/mysql_query.rb index 59623973..832e2d64 100644 --- a/lib/rademade_admin/model/adapter/query/mysql_query.rb +++ b/app/services/rademade_admin/model/adapter/query/mysql_query.rb @@ -3,7 +3,7 @@ module RademadeAdmin module Model module Adapter class Query - class MysqlQuery < RademadeAdmin::Model::Adapter::Query::ActiveRecord + class MysqlQuery < RademadeAdmin::Model::Adapter::Query::ActiveRecordQuery end end diff --git a/lib/rademade_admin/model/adapter/query/postgresql_query.rb b/app/services/rademade_admin/model/adapter/query/postgresql_query.rb similarity index 100% rename from lib/rademade_admin/model/adapter/query/postgresql_query.rb rename to app/services/rademade_admin/model/adapter/query/postgresql_query.rb diff --git a/lib/rademade_admin/model/adapter/query/sequel_query.rb b/app/services/rademade_admin/model/adapter/query/sequel_query.rb similarity index 100% rename from lib/rademade_admin/model/adapter/query/sequel_query.rb rename to app/services/rademade_admin/model/adapter/query/sequel_query.rb diff --git a/lib/rademade_admin/model/adapter/query/sql_query.rb b/app/services/rademade_admin/model/adapter/query/sql_query.rb similarity index 100% rename from lib/rademade_admin/model/adapter/query/sql_query.rb rename to app/services/rademade_admin/model/adapter/query/sql_query.rb diff --git a/lib/rademade_admin/model/configuration.rb b/app/services/rademade_admin/model/configuration.rb similarity index 100% rename from lib/rademade_admin/model/configuration.rb rename to app/services/rademade_admin/model/configuration.rb diff --git a/lib/rademade_admin/model/configuration/csv_fields.rb b/app/services/rademade_admin/model/configuration/csv_fields.rb similarity index 100% rename from lib/rademade_admin/model/configuration/csv_fields.rb rename to app/services/rademade_admin/model/configuration/csv_fields.rb diff --git a/lib/rademade_admin/model/configuration/field_label.rb b/app/services/rademade_admin/model/configuration/field_label.rb similarity index 100% rename from lib/rademade_admin/model/configuration/field_label.rb rename to app/services/rademade_admin/model/configuration/field_label.rb diff --git a/lib/rademade_admin/model/configuration/fields.rb b/app/services/rademade_admin/model/configuration/fields.rb similarity index 100% rename from lib/rademade_admin/model/configuration/fields.rb rename to app/services/rademade_admin/model/configuration/fields.rb diff --git a/lib/rademade_admin/model/configuration/fields_labels.rb b/app/services/rademade_admin/model/configuration/fields_labels.rb similarity index 100% rename from lib/rademade_admin/model/configuration/fields_labels.rb rename to app/services/rademade_admin/model/configuration/fields_labels.rb diff --git a/lib/rademade_admin/model/configuration/form_field.rb b/app/services/rademade_admin/model/configuration/form_field.rb similarity index 100% rename from lib/rademade_admin/model/configuration/form_field.rb rename to app/services/rademade_admin/model/configuration/form_field.rb diff --git a/lib/rademade_admin/model/configuration/form_fields.rb b/app/services/rademade_admin/model/configuration/form_fields.rb similarity index 100% rename from lib/rademade_admin/model/configuration/form_fields.rb rename to app/services/rademade_admin/model/configuration/form_fields.rb diff --git a/lib/rademade_admin/model/configuration/list_field.rb b/app/services/rademade_admin/model/configuration/list_field.rb similarity index 100% rename from lib/rademade_admin/model/configuration/list_field.rb rename to app/services/rademade_admin/model/configuration/list_field.rb diff --git a/lib/rademade_admin/model/configuration/list_fields.rb b/app/services/rademade_admin/model/configuration/list_fields.rb similarity index 100% rename from lib/rademade_admin/model/configuration/list_fields.rb rename to app/services/rademade_admin/model/configuration/list_fields.rb diff --git a/lib/rademade_admin/model/graph.rb b/app/services/rademade_admin/model/graph.rb similarity index 100% rename from lib/rademade_admin/model/graph.rb rename to app/services/rademade_admin/model/graph.rb diff --git a/lib/rademade_admin/model/info.rb b/app/services/rademade_admin/model/info.rb similarity index 100% rename from lib/rademade_admin/model/info.rb rename to app/services/rademade_admin/model/info.rb diff --git a/lib/rademade_admin/model/info/data_item.rb b/app/services/rademade_admin/model/info/data_item.rb similarity index 99% rename from lib/rademade_admin/model/info/data_item.rb rename to app/services/rademade_admin/model/info/data_item.rb index 1fafbc5e..49ca0bdc 100644 --- a/lib/rademade_admin/model/info/data_item.rb +++ b/app/services/rademade_admin/model/info/data_item.rb @@ -47,7 +47,7 @@ def sortable_relation? end def gallery_relation? - @relation.is_a? RademadeAdmin::Model::Info::Relation::Gallery + @relation.is_a? RademadeAdmin::Model::Info::Relation::GalleryRelation end def localizable?(localizable = true) @@ -142,4 +142,4 @@ def _getter end end end -end \ No newline at end of file +end diff --git a/lib/rademade_admin/model/info/data_item/initializer.rb b/app/services/rademade_admin/model/info/data_item/initializer.rb similarity index 100% rename from lib/rademade_admin/model/info/data_item/initializer.rb rename to app/services/rademade_admin/model/info/data_item/initializer.rb diff --git a/lib/rademade_admin/model/info/data_items.rb b/app/services/rademade_admin/model/info/data_items.rb similarity index 100% rename from lib/rademade_admin/model/info/data_items.rb rename to app/services/rademade_admin/model/info/data_items.rb diff --git a/lib/rademade_admin/model/info/field.rb b/app/services/rademade_admin/model/info/field.rb similarity index 100% rename from lib/rademade_admin/model/info/field.rb rename to app/services/rademade_admin/model/info/field.rb diff --git a/lib/rademade_admin/model/info/field/type.rb b/app/services/rademade_admin/model/info/field/type.rb similarity index 100% rename from lib/rademade_admin/model/info/field/type.rb rename to app/services/rademade_admin/model/info/field/type.rb diff --git a/lib/rademade_admin/model/info/fields.rb b/app/services/rademade_admin/model/info/fields.rb similarity index 100% rename from lib/rademade_admin/model/info/fields.rb rename to app/services/rademade_admin/model/info/fields.rb diff --git a/lib/rademade_admin/model/info/relation.rb b/app/services/rademade_admin/model/info/relation.rb similarity index 100% rename from lib/rademade_admin/model/info/relation.rb rename to app/services/rademade_admin/model/info/relation.rb diff --git a/lib/rademade_admin/model/info/relation/gallery_relation.rb b/app/services/rademade_admin/model/info/relation/gallery_relation.rb similarity index 100% rename from lib/rademade_admin/model/info/relation/gallery_relation.rb rename to app/services/rademade_admin/model/info/relation/gallery_relation.rb diff --git a/lib/rademade_admin/model/info/relations.rb b/app/services/rademade_admin/model/info/relations.rb similarity index 100% rename from lib/rademade_admin/model/info/relations.rb rename to app/services/rademade_admin/model/info/relations.rb diff --git a/lib/rademade_admin/model/info/uploader.rb b/app/services/rademade_admin/model/info/uploader.rb similarity index 100% rename from lib/rademade_admin/model/info/uploader.rb rename to app/services/rademade_admin/model/info/uploader.rb diff --git a/lib/rademade_admin/model/info/uploaders.rb b/app/services/rademade_admin/model/info/uploaders.rb similarity index 100% rename from lib/rademade_admin/model/info/uploaders.rb rename to app/services/rademade_admin/model/info/uploaders.rb diff --git a/lib/rademade_admin/model/reflection.rb b/app/services/rademade_admin/model/reflection.rb similarity index 100% rename from lib/rademade_admin/model/reflection.rb rename to app/services/rademade_admin/model/reflection.rb diff --git a/lib/rademade_admin/search/searcher.rb b/app/services/rademade_admin/search/searcher.rb similarity index 100% rename from lib/rademade_admin/search/searcher.rb rename to app/services/rademade_admin/search/searcher.rb diff --git a/lib/rademade_admin/sortable.rb b/app/services/rademade_admin/sortable.rb similarity index 100% rename from lib/rademade_admin/sortable.rb rename to app/services/rademade_admin/sortable.rb diff --git a/lib/rademade_admin/uploader/carrier_wave.rb b/app/services/rademade_admin/uploader/carrier_wave.rb similarity index 100% rename from lib/rademade_admin/uploader/carrier_wave.rb rename to app/services/rademade_admin/uploader/carrier_wave.rb diff --git a/lib/rademade_admin/uploader/crop_photo.rb b/app/services/rademade_admin/uploader/crop_photo.rb similarity index 100% rename from lib/rademade_admin/uploader/crop_photo.rb rename to app/services/rademade_admin/uploader/crop_photo.rb diff --git a/lib/rademade_admin/uploader/photo.rb b/app/services/rademade_admin/uploader/photo.rb similarity index 100% rename from lib/rademade_admin/uploader/photo.rb rename to app/services/rademade_admin/uploader/photo.rb diff --git a/lib/rademade_admin/uploader/video.rb b/app/services/rademade_admin/uploader/video.rb similarity index 100% rename from lib/rademade_admin/uploader/video.rb rename to app/services/rademade_admin/uploader/video.rb diff --git a/lib/rademade_admin/user.rb b/app/services/rademade_admin/user_module.rb similarity index 100% rename from lib/rademade_admin/user.rb rename to app/services/rademade_admin/user_module.rb diff --git a/lib/rademade_admin.rb b/lib/rademade_admin.rb index 40936944..16d407b3 100644 --- a/lib/rademade_admin.rb +++ b/lib/rademade_admin.rb @@ -12,8 +12,6 @@ require 'simple_form' require 'ckeditor' require 'rademade_admin/ckeditor_utils' - -require 'rademade_admin/sortable' require 'rademade_admin/engine' module RademadeAdmin @@ -26,4 +24,4 @@ module RademadeAdmin default_config.ability_class = ::RademadeAdmin::Ability end -end \ No newline at end of file +end From d85301621e5bf8c0150a4067d145a26d5c4614e7 Mon Sep 17 00:00:00 2001 From: xfearx Date: Tue, 18 Dec 2018 15:35:14 +0200 Subject: [PATCH 039/114] admin panel fix --- app/controllers/rademade_admin/file_controller.rb | 4 ++-- app/controllers/rademade_admin/gallery_controller.rb | 2 +- app/helpers/rademade_admin/field_helper.rb | 2 +- app/inputs/rademade_admin/file_input.rb | 2 +- app/inputs/rademade_admin/gallery_input.rb | 2 +- app/services/rademade_admin/upload/image_presenter.rb | 2 +- .../upload/preview/{file.rb => file_preview.rb} | 2 +- .../upload/preview/{gallery.rb => gallery_preview.rb} | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) rename app/services/rademade_admin/upload/preview/{file.rb => file_preview.rb} (97%) rename app/services/rademade_admin/upload/preview/{gallery.rb => gallery_preview.rb} (95%) diff --git a/app/controllers/rademade_admin/file_controller.rb b/app/controllers/rademade_admin/file_controller.rb index fe3e9b02..33e9c2ec 100644 --- a/app/controllers/rademade_admin/file_controller.rb +++ b/app/controllers/rademade_admin/file_controller.rb @@ -5,7 +5,7 @@ def upload param_key = params[:column].to_sym uploader.store!(params[param_key]) render :json => { - :html => RademadeAdmin::Upload::Preview::File.new(uploader).preview_html, + :html => RademadeAdmin::Upload::Preview::FilePreview.new(uploader).preview_html, :file => JSON.parse(uploader.to_json).merge(url: uploader.url) } rescue CarrierWave::UploadError => e @@ -20,7 +20,7 @@ def download def crop image = uploader.crop_image(params[:crop], params[:path]) uploader.store!(image) - preview_service = RademadeAdmin::Upload::Preview::File.new(uploader) + preview_service = RademadeAdmin::Upload::Preview::FilePreview.new(uploader) render :json => { :image_data => preview_service.image_data(uploader), :resized_url => preview_service.image_preview diff --git a/app/controllers/rademade_admin/gallery_controller.rb b/app/controllers/rademade_admin/gallery_controller.rb index 223c46a6..9edb55f3 100644 --- a/app/controllers/rademade_admin/gallery_controller.rb +++ b/app/controllers/rademade_admin/gallery_controller.rb @@ -11,7 +11,7 @@ def upload def crop uploader = gallery_service.crop_image(params[:id], params[:crop]) - preview_service = RademadeAdmin::Upload::Preview::Gallery.new + preview_service = RademadeAdmin::Upload::Preview::GalleryPreview.new render :json => { :image_data => preview_service.image_data(uploader), :resized_url => preview_service.gallery_image_preview(uploader) diff --git a/app/helpers/rademade_admin/field_helper.rb b/app/helpers/rademade_admin/field_helper.rb index 0e979edd..ccf17908 100644 --- a/app/helpers/rademade_admin/field_helper.rb +++ b/app/helpers/rademade_admin/field_helper.rb @@ -39,7 +39,7 @@ def display_related_item(data_item, item, value) end def display_upload_item(value) - RademadeAdmin::Upload::Preview::File.new(value).uploaded_file_html + RademadeAdmin::Upload::Preview::FilePreview.new(value).uploaded_file_html end def input_attr(attrs = {}) diff --git a/app/inputs/rademade_admin/file_input.rb b/app/inputs/rademade_admin/file_input.rb index 15ea241a..88fbdb98 100644 --- a/app/inputs/rademade_admin/file_input.rb +++ b/app/inputs/rademade_admin/file_input.rb @@ -70,7 +70,7 @@ def input_hidden_html end def upload_preview_service - @upload_preview_service ||= RademadeAdmin::Upload::Preview::File.new(uploader) + @upload_preview_service ||= RademadeAdmin::Upload::Preview::FilePreview.new(uploader) end def uploader diff --git a/app/inputs/rademade_admin/gallery_input.rb b/app/inputs/rademade_admin/gallery_input.rb index 58956b14..7b5f035c 100644 --- a/app/inputs/rademade_admin/gallery_input.rb +++ b/app/inputs/rademade_admin/gallery_input.rb @@ -27,7 +27,7 @@ def gallery_block_html def images_html html = [] - preview_service = RademadeAdmin::Upload::Preview::Gallery.new + preview_service = RademadeAdmin::Upload::Preview::GalleryPreview.new gallery.images.each do |gallery_image| html << preview_service.preview_html(gallery_image.image) end diff --git a/app/services/rademade_admin/upload/image_presenter.rb b/app/services/rademade_admin/upload/image_presenter.rb index e6377a7c..ad1243f1 100644 --- a/app/services/rademade_admin/upload/image_presenter.rb +++ b/app/services/rademade_admin/upload/image_presenter.rb @@ -30,7 +30,7 @@ def add_gallery_image(gallery_image) end def preview_service - @preview_service ||= RademadeAdmin::Upload::Preview::Gallery.new + @preview_service ||= RademadeAdmin::Upload::Preview::GalleryPreview.new end end diff --git a/app/services/rademade_admin/upload/preview/file.rb b/app/services/rademade_admin/upload/preview/file_preview.rb similarity index 97% rename from app/services/rademade_admin/upload/preview/file.rb rename to app/services/rademade_admin/upload/preview/file_preview.rb index 39fe08bb..e8e21a8c 100644 --- a/app/services/rademade_admin/upload/preview/file.rb +++ b/app/services/rademade_admin/upload/preview/file_preview.rb @@ -2,7 +2,7 @@ module RademadeAdmin module Upload class Preview - class File < RademadeAdmin::Upload::Preview + class FilePreview < RademadeAdmin::Upload::Preview include ActionView::Helpers::NumberHelper diff --git a/app/services/rademade_admin/upload/preview/gallery.rb b/app/services/rademade_admin/upload/preview/gallery_preview.rb similarity index 95% rename from app/services/rademade_admin/upload/preview/gallery.rb rename to app/services/rademade_admin/upload/preview/gallery_preview.rb index 789788be..b987cc48 100644 --- a/app/services/rademade_admin/upload/preview/gallery.rb +++ b/app/services/rademade_admin/upload/preview/gallery_preview.rb @@ -2,7 +2,7 @@ module RademadeAdmin module Upload class Preview - class Gallery < RademadeAdmin::Upload::Preview + class GalleryPreview < RademadeAdmin::Upload::Preview def preview_html(uploader) content_tag(:div, image_item_html(uploader), From f1027f66a99ec01435fa61a514859a0fee0c7e2b Mon Sep 17 00:00:00 2001 From: xfearx Date: Tue, 18 Dec 2018 16:46:41 +0200 Subject: [PATCH 040/114] fixed mailer --- app/mailers/rademade_admin/application_mailer.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/mailers/rademade_admin/application_mailer.rb b/app/mailers/rademade_admin/application_mailer.rb index 666abbcf..7072204b 100644 --- a/app/mailers/rademade_admin/application_mailer.rb +++ b/app/mailers/rademade_admin/application_mailer.rb @@ -1,8 +1,7 @@ module RademadeAdmin - class ApplicationMailer < ActionMailer::Base - default from: RademadeAdmin.configuration.mail_from || 'admin@example.com' + layout 'mailer' - end + end end From 2a39bcb175c502241b960dfab186ede7930828ae Mon Sep 17 00:00:00 2001 From: xfearx Date: Thu, 20 Dec 2018 18:18:35 +0200 Subject: [PATCH 041/114] fixed abilities --- app/views/rademade_admin/_blocks/_list.html.erb | 2 +- app/views/rademade_admin/_blocks/navigation/menu/_item.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/rademade_admin/_blocks/_list.html.erb b/app/views/rademade_admin/_blocks/_list.html.erb index 9946f5e4..c1313278 100644 --- a/app/views/rademade_admin/_blocks/_list.html.erb +++ b/app/views/rademade_admin/_blocks/_list.html.erb @@ -1,6 +1,6 @@ <% content_for :nav_buttons do %><% new_uri = admin_new_uri(@model_info) - if new_uri + if new_uri && can?(:create, @model_info.model) %><% concat t('rademade_admin.record.new') %><% diff --git a/app/views/rademade_admin/_blocks/navigation/menu/_item.html.erb b/app/views/rademade_admin/_blocks/navigation/menu/_item.html.erb index b5fc5e89..f5bedac2 100644 --- a/app/views/rademade_admin/_blocks/navigation/menu/_item.html.erb +++ b/app/views/rademade_admin/_blocks/navigation/menu/_item.html.erb @@ -1,5 +1,5 @@ <% -has_sub_items = (menu_item[:sub].is_a? Array and menu_item[:sub].size > 0) +has_sub_items = menu_item[:sub].is_a?(Array) && menu_item[:sub].size > 0 && menu_item[:sub].any? { |sub| sub[:uri] } uri = menu_item[:uri] if has_sub_items || uri is_active = active?(menu_item) From f5c605f4fde1386cbcc49d8432089da3c3deb329 Mon Sep 17 00:00:00 2001 From: Praffesor Date: Wed, 26 Dec 2018 10:58:11 +0200 Subject: [PATCH 042/114] renamed version file and increased version to 0.4 --- .../{version.rb => rademade_admin_version.rb} | 4 ++-- lib/tasks/rademade_admin_tasks.rake | 4 ---- lib/templates/erb/scaffold/_form.html.erb | 13 ------------- rademade_admin.gemspec | 2 +- 4 files changed, 3 insertions(+), 20 deletions(-) rename lib/rademade_admin/{version.rb => rademade_admin_version.rb} (66%) delete mode 100644 lib/tasks/rademade_admin_tasks.rake delete mode 100644 lib/templates/erb/scaffold/_form.html.erb diff --git a/lib/rademade_admin/version.rb b/lib/rademade_admin/rademade_admin_version.rb similarity index 66% rename from lib/rademade_admin/version.rb rename to lib/rademade_admin/rademade_admin_version.rb index f006034d..9db67daf 100644 --- a/lib/rademade_admin/version.rb +++ b/lib/rademade_admin/rademade_admin_version.rb @@ -1,4 +1,4 @@ # -*- encoding : utf-8 -*- module RademadeAdmin - VERSION = '0.3.0' -end \ No newline at end of file + VERSION = '0.4.0' +end diff --git a/lib/tasks/rademade_admin_tasks.rake b/lib/tasks/rademade_admin_tasks.rake deleted file mode 100644 index ed478274..00000000 --- a/lib/tasks/rademade_admin_tasks.rake +++ /dev/null @@ -1,4 +0,0 @@ -# desc "Explaining what the task does" -# task :rademade_admin do -# # Task goes here -# end diff --git a/lib/templates/erb/scaffold/_form.html.erb b/lib/templates/erb/scaffold/_form.html.erb deleted file mode 100644 index 201a069e..00000000 --- a/lib/templates/erb/scaffold/_form.html.erb +++ /dev/null @@ -1,13 +0,0 @@ -<%%= simple_form_for(@<%= singular_table_name %>) do |f| %> - <%%= f.error_notification %> - -
- <%- attributes.each do |attribute| -%> - <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %> - <%- end -%> -
- -
- <%%= f.button :submit %> -
-<%% end %> diff --git a/rademade_admin.gemspec b/rademade_admin.gemspec index af9896be..f5c57427 100644 --- a/rademade_admin.gemspec +++ b/rademade_admin.gemspec @@ -1,7 +1,7 @@ #encoding: utf-8 $:.push File.expand_path('../lib', __FILE__) -require 'rademade_admin/version' +require 'rademade_admin/rademade_admin_version' Gem::Specification.new do |s| s.name = 'rademade_admin' From 991a5230b2430ce6c6a03fba4985d452b93ee665 Mon Sep 17 00:00:00 2001 From: xfearx Date: Wed, 26 Dec 2018 15:32:59 +0200 Subject: [PATCH 043/114] fixed autocomplete routing --- config/initializers/routes.rb | 2 +- lib/rademade_admin/routing_resource.rb | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 lib/rademade_admin/routing_resource.rb diff --git a/config/initializers/routes.rb b/config/initializers/routes.rb index 5ffe591b..84c1bf50 100644 --- a/config/initializers/routes.rb +++ b/config/initializers/routes.rb @@ -10,7 +10,7 @@ def admin_resources(*resources, &block) with_scope_level(:resources) do options = apply_action_options options - resource_scope(Resource.new(resources.pop, api_only?, @scope[:shallow], options)) do + resource_scope(::RademadeAdmin::RoutingResource.new(resources.pop, api_only?, @scope[:shallow], options)) do yield if block_given? concerns(options[:concerns]) if options[:concerns] diff --git a/lib/rademade_admin/routing_resource.rb b/lib/rademade_admin/routing_resource.rb new file mode 100644 index 00000000..1da52dbb --- /dev/null +++ b/lib/rademade_admin/routing_resource.rb @@ -0,0 +1,9 @@ +module RademadeAdmin + class RoutingResource < ActionDispatch::Routing::Mapper::Resources::Resource + + def default_actions + super + [:autocomplete] + end + + end +end \ No newline at end of file From 5bd5df912c8a2ebae4159aaed01c8b43e5445d74 Mon Sep 17 00:00:00 2001 From: xfearx Date: Wed, 26 Dec 2018 17:08:34 +0200 Subject: [PATCH 044/114] added hint for duplication button --- app/assets/javascripts/app/templates/related-item.jst.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/templates/related-item.jst.ejs b/app/assets/javascripts/app/templates/related-item.jst.ejs index 787b5ad7..46ee3da7 100644 --- a/app/assets/javascripts/app/templates/related-item.jst.ejs +++ b/app/assets/javascripts/app/templates/related-item.jst.ejs @@ -7,7 +7,7 @@ if (isDeletable) { %>
<%= I18n.t('rademade_admin.relation.destroy') %>
<% } if (isDuplicatable) { - %>
+ %>
<% } From b995f8dbd2fbfad8a6c1a8b9da82419468b42c49 Mon Sep 17 00:00:00 2001 From: Praffesor Date: Wed, 23 Jan 2019 18:41:16 +0200 Subject: [PATCH 045/114] updated inputs for editable and destroyable --- app/assets/javascripts/app/content/view.coffee | 1 + app/assets/javascripts/app/select2/view.coffee | 7 +++++-- app/helpers/rademade_admin/form_helper.rb | 7 ++++++- app/inputs/rademade_admin/file_input.rb | 5 +++-- app/inputs/rademade_admin/gallery_input.rb | 12 +++++++----- app/inputs/rademade_admin/related_select_input.rb | 9 ++++++--- .../related_select_input/related_list.rb | 8 ++++---- .../rademade_admin/upload/preview/gallery_preview.rb | 12 +++++++----- 8 files changed, 39 insertions(+), 22 deletions(-) diff --git a/app/assets/javascripts/app/content/view.coffee b/app/assets/javascripts/app/content/view.coffee index b8f0a81a..8e4788cd 100644 --- a/app/assets/javascripts/app/content/view.coffee +++ b/app/assets/javascripts/app/content/view.coffee @@ -1,6 +1,7 @@ class @Content extends Backbone.View renderItemFromUrl : (url, cb, urlData = {}) -> + return if url == '' $(document).trigger 'before-content-render' @_updateHistory(url) $.get url, _.extend(urlData, layout : false), (html) => diff --git a/app/assets/javascripts/app/select2/view.coffee b/app/assets/javascripts/app/select2/view.coffee index e11adc00..be0e29b1 100644 --- a/app/assets/javascripts/app/select2/view.coffee +++ b/app/assets/javascripts/app/select2/view.coffee @@ -13,6 +13,8 @@ class @Select2Input.View extends Backbone.View searchUrl : @$item.data('searchUrl') newUrl : @$item.data('newUrl') multiple : @$item.data('relMultiple') + editable : @$item.data('editable') + destroyable : @$item.data('destroyable') initRelated : () -> if @model.isMultiple() @@ -29,7 +31,7 @@ class @Select2Input.View extends Backbone.View @$item.select2( multiple : @model.isMultiple() placeholder : I18n.t('rademade_admin.relation.search') - allowClear : true + allowClear : @model.get('destroyable') formatNoMatches : () -> I18n.t('select2.no_results') formatSelection : (data, $container) => @@ -50,7 +52,7 @@ class @Select2Input.View extends Backbone.View Content.getInstance().renderModel @model.get('related') _appendEditButton : ($container) -> - unless @model.isMultiple() or @initalized + if !(@model.isMultiple() or @initalized) and @model.get('editable') @initalized = yes @$edit = $ @_editButton() @$edit.on 'mousedown', () => @@ -59,6 +61,7 @@ class @Select2Input.View extends Backbone.View $container.after @$edit _appendAddButton : () -> + return unless @model.get('newUrl') $addPlaceholder = $ @_placeholderForAdd() $addPlaceholder.click () => @$item.select2('close') diff --git a/app/helpers/rademade_admin/form_helper.rb b/app/helpers/rademade_admin/form_helper.rb index cd7b4406..e9cf5efe 100644 --- a/app/helpers/rademade_admin/form_helper.rb +++ b/app/helpers/rademade_admin/form_helper.rb @@ -16,7 +16,12 @@ def admin_field(form, data_item, model_info) attrs = admin_default_params(name, model_info) .merge(field_params(data_item)) .merge(input_params(name)) - concat form.input(name, input_attr(attrs)) + editable = can?(:update, @item) + concat form.input(name, input_attr(attrs).merge({ + editable: editable, + destroyable: can?(:destroy, @item), + disabled: !editable + })) end end diff --git a/app/inputs/rademade_admin/file_input.rb b/app/inputs/rademade_admin/file_input.rb index 88fbdb98..8d0c451b 100644 --- a/app/inputs/rademade_admin/file_input.rb +++ b/app/inputs/rademade_admin/file_input.rb @@ -37,8 +37,9 @@ def holder_html(inner_html, hidden = false) def file_preview_html template.content_tag(:div, upload_preview_service.preview_html, :class => 'upload-item') end - + def upload_button_html + return unless options[:editable] template.content_tag( :div, RademadeAdmin::HtmlBuffer.new([ @@ -106,4 +107,4 @@ def uploader_params end end -end \ No newline at end of file +end diff --git a/app/inputs/rademade_admin/gallery_input.rb b/app/inputs/rademade_admin/gallery_input.rb index 7b5f035c..c526625f 100644 --- a/app/inputs/rademade_admin/gallery_input.rb +++ b/app/inputs/rademade_admin/gallery_input.rb @@ -12,9 +12,9 @@ def input(wrapper_options = {}) :data => { :gallery => '' } ) end - + protected - + def gallery_block_html is_sortable = gallery_image_info.sortable_relation? template.content_tag(:div, images_html, @@ -29,13 +29,15 @@ def images_html html = [] preview_service = RademadeAdmin::Upload::Preview::GalleryPreview.new gallery.images.each do |gallery_image| - html << preview_service.preview_html(gallery_image.image) + html << preview_service.preview_html(gallery_image.image, options.slice(:editable, :destroyable)) end HtmlBuffer.new(html) end def upload_block_html - template.content_tag(:div, upload_button_html, :class => 'upload-holder') + if options[:editable] + template.content_tag(:div, upload_button_html, :class => 'upload-holder') + end end def upload_button_html @@ -85,4 +87,4 @@ def model_info(class_name, data_item_name) end end -end \ No newline at end of file +end diff --git a/app/inputs/rademade_admin/related_select_input.rb b/app/inputs/rademade_admin/related_select_input.rb index 1d372a6e..13eb3e0d 100644 --- a/app/inputs/rademade_admin/related_select_input.rb +++ b/app/inputs/rademade_admin/related_select_input.rb @@ -43,10 +43,13 @@ def reflection_data new_url = admin_new_form_uri(related_to) data = { :'rel-multiple' => multiple?, - :'rel-class' => related_to.to_s + :'rel-class' => related_to.to_s, + :editable => options[:editable], + :destroyable => options[:destroyable], + :disabled => options[:disabled] } - data[:'search-url'] = search_url unless search_url.nil? - data[:'new-url'] = new_url unless new_url.nil? + data[:'search-url'] = search_url if options[:editable] && search_url + data[:'new-url'] = new_url if options[:editable] && new_url data end diff --git a/app/inputs/rademade_admin/related_select_input/related_list.rb b/app/inputs/rademade_admin/related_select_input/related_list.rb index 734ab214..b0eaebf8 100644 --- a/app/inputs/rademade_admin/related_select_input/related_list.rb +++ b/app/inputs/rademade_admin/related_select_input/related_list.rb @@ -11,7 +11,7 @@ def related_list_html :data => { :sortable => sortable_relation?, :deletable => destroyable_relation?, - :duplicatable => options[:duplicatable] + :duplicatable => options[:editable] && options[:duplicatable] } }) end @@ -43,7 +43,7 @@ def draggable_button_html def related_list_item_title_html(serialized_value) template.content_tag(:button, serialized_value[:text], { - :'data-edit' => serialized_value[:editurl], + :'data-edit' => options[:editable] ? serialized_value[:editurl] : '', :class => 'select2-item-edit' }) end @@ -62,11 +62,11 @@ def related_item_class end def sortable_relation? - related_data_item.relation.sortable? + options[:editable] && related_data_item.relation.sortable? end def destroyable_relation? - related_data_item.relation.destroyable? + options[:destroyable] && related_data_item.relation.destroyable? end end diff --git a/app/services/rademade_admin/upload/preview/gallery_preview.rb b/app/services/rademade_admin/upload/preview/gallery_preview.rb index b987cc48..40b526e4 100644 --- a/app/services/rademade_admin/upload/preview/gallery_preview.rb +++ b/app/services/rademade_admin/upload/preview/gallery_preview.rb @@ -4,8 +4,8 @@ module Upload class Preview class GalleryPreview < RademadeAdmin::Upload::Preview - def preview_html(uploader) - content_tag(:div, image_item_html(uploader), + def preview_html(uploader, options = { editable: true, destroyable: true }) + content_tag(:div, image_item_html(uploader, options), :class => 'upload-holder', :data => image_data(uploader) ) @@ -23,10 +23,12 @@ def crop_url private - def image_item_html(uploader) + def image_item_html(uploader, options) + html_parts = [image_html(uploader)] + html_parts << remove_ico_html(uploader) if options[:destroyable] content_tag( :div, - HtmlBuffer.new([image_html(uploader), remove_ico_html(uploader)]), + HtmlBuffer.new(html_parts), :class => 'upload-item' ) end @@ -52,4 +54,4 @@ def remove_ico_html(uploader) end end end -end \ No newline at end of file +end From 429dcff5c7383ede260088d90107d4e8c4980aca Mon Sep 17 00:00:00 2001 From: xfearx Date: Fri, 1 Feb 2019 19:29:42 +0200 Subject: [PATCH 046/114] fixed validation errors --- .../rademade_admin/related_select_input/related_list.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/inputs/rademade_admin/related_select_input/related_list.rb b/app/inputs/rademade_admin/related_select_input/related_list.rb index b0eaebf8..abdb755e 100644 --- a/app/inputs/rademade_admin/related_select_input/related_list.rb +++ b/app/inputs/rademade_admin/related_select_input/related_list.rb @@ -20,8 +20,8 @@ def related_list_items_html serialized_values = serializer.new(related_value).as_json html = serialized_values.map do |serialized_value| template.content_tag(:li, related_list_item_html(serialized_value), { - :'data-id' => serialized_value[:id], - :class => related_item_class + :class => related_item_class, + :data => serialized_value }) end RademadeAdmin::HtmlBuffer.new(html) From 4f7e7230d076c3b34a23bdf31b36a90deb8271db Mon Sep 17 00:00:00 2001 From: Igor Korobenko Date: Sat, 2 Feb 2019 18:03:26 +0200 Subject: [PATCH 047/114] added stable version jquery-flot --- Bowerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bowerfile b/Bowerfile index 19bf4d4b..0b19838e 100644 --- a/Bowerfile +++ b/Bowerfile @@ -9,7 +9,7 @@ asset 'leaflet' # jQuery asset 'data-tables', :github => 'DataTables/DataTables' -asset 'flot', :github => 'flot/flot' +asset 'flot', :github => 'flot/flot#0.9-work' asset 'knob', :github => 'aterrien/jQuery-Knob' asset 'uniform', :github => 'AudithSoftworks/Uniform' asset 'jquery-ui', :github => 'jquery/jquery-ui#1.11.4' From 51d4328a9b0bd61029b0cbe6148b9f7d27c575ed Mon Sep 17 00:00:00 2001 From: Igor Korobenko Date: Sat, 2 Feb 2019 18:03:26 +0200 Subject: [PATCH 048/114] Revert "added stable version jquery-flot" This reverts commit 4f7e7230d076c3b34a23bdf31b36a90deb8271db. --- Bowerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bowerfile b/Bowerfile index 0b19838e..19bf4d4b 100644 --- a/Bowerfile +++ b/Bowerfile @@ -9,7 +9,7 @@ asset 'leaflet' # jQuery asset 'data-tables', :github => 'DataTables/DataTables' -asset 'flot', :github => 'flot/flot#0.9-work' +asset 'flot', :github => 'flot/flot' asset 'knob', :github => 'aterrien/jQuery-Knob' asset 'uniform', :github => 'AudithSoftworks/Uniform' asset 'jquery-ui', :github => 'jquery/jquery-ui#1.11.4' From c0cedab6b8978ad6ff9c24f8f3d151c407b0059b Mon Sep 17 00:00:00 2001 From: Igor Korobenko Date: Sat, 2 Feb 2019 18:05:45 +0200 Subject: [PATCH 049/114] /sequel: Auto stash before revert of "added stable version jquery-flot" --- Bowerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bowerfile b/Bowerfile index 19bf4d4b..91406a1b 100644 --- a/Bowerfile +++ b/Bowerfile @@ -9,7 +9,7 @@ asset 'leaflet' # jQuery asset 'data-tables', :github => 'DataTables/DataTables' -asset 'flot', :github => 'flot/flot' +asset 'flot', :github => 'flot/flot#v0.8.3' asset 'knob', :github => 'aterrien/jQuery-Knob' asset 'uniform', :github => 'AudithSoftworks/Uniform' asset 'jquery-ui', :github => 'jquery/jquery-ui#1.11.4' From a4e824ccd7ca7c682e5545a6d728bfeae4e3ce58 Mon Sep 17 00:00:00 2001 From: Praffesor Date: Tue, 5 Feb 2019 12:19:18 +0200 Subject: [PATCH 050/114] renamed gallery manager service --- .../rademade_admin/gallery_controller.rb | 2 +- .../rademade_admin/gallery/manager.rb | 94 ------------------- .../rademade_admin/gallery_manager.rb | 92 ++++++++++++++++++ 3 files changed, 93 insertions(+), 95 deletions(-) delete mode 100644 app/services/rademade_admin/gallery/manager.rb create mode 100644 app/services/rademade_admin/gallery_manager.rb diff --git a/app/controllers/rademade_admin/gallery_controller.rb b/app/controllers/rademade_admin/gallery_controller.rb index 9edb55f3..513027f6 100644 --- a/app/controllers/rademade_admin/gallery_controller.rb +++ b/app/controllers/rademade_admin/gallery_controller.rb @@ -41,7 +41,7 @@ def show_error(error) end def gallery_service - @gallery_service ||= RademadeAdmin::Gallery::Manager.new(params[:class_name]) + @gallery_service ||= RademadeAdmin::GalleryManager.new(params[:class_name]) end end diff --git a/app/services/rademade_admin/gallery/manager.rb b/app/services/rademade_admin/gallery/manager.rb deleted file mode 100644 index 59c08a67..00000000 --- a/app/services/rademade_admin/gallery/manager.rb +++ /dev/null @@ -1,94 +0,0 @@ -module RademadeAdmin - module Gallery - class Manager - - def initialize(class_name) - @class_name = class_name - end - - def upload_images(gallery_id, files) - gallery = gallery_info.query_adapter.find(gallery_id) - image_presenter = upload_gallery_images(files) - save_gallery_images(gallery, image_presenter.gallery_images) - image_presenter.gallery_images_html - end - - def crop_image(image_id, crop_data) - gallery_image = gallery_image_info.query_adapter.find(image_id) - uploader = gallery_image.image - image = uploader.crop_image(crop_data) - uploader.store!(image) - gallery_image_info.persistence_adapter.save(gallery_image) - uploader - end - - def remove_image(image_id) - gallery_image = gallery_image_info.query_adapter.find(image_id) - gallery_image_info.persistence_adapter.destroy(gallery_image) - end - - def sort_images(images) - sort_gallery_images images - end - - protected - - def gallery_info - @gallery_info ||= RademadeAdmin::Model::Graph.instance.model_info(@class_name) - end - - def gallery_image_data_item - @gallery_image_data_item ||= gallery_info.data_items.data_item(:images) - end - - def gallery_image_relation - @gallery_image_relation ||= gallery_image_data_item.relation - end - - def gallery_image_info - @gallery_image_info ||= RademadeAdmin::Model::Graph.instance.model_info(gallery_image_relation.to) - end - - def upload_gallery_images(images) - image_presenter = RademadeAdmin::Upload::ImagePresenter.new(gallery_image_info.persistence_adapter) - image_presenter.upload_gallery_images(images) - image_presenter - end - - def save_gallery_images(gallery, gallery_images) - gallery_image_data_item.set_data(gallery, gallery.images + gallery_images) - gallery_images.each do |gallery_image| - update_gallery_image_position(gallery, gallery_image) - gallery_image_info.persistence_adapter.save(gallery_image) - end - gallery_info.persistence_adapter.save(gallery) - end - - def sort_gallery_images(images) - images.each_with_index do |image_id, index| - gallery_image = gallery_image_info.query_adapter.find(image_id) - set_gallery_image_position(gallery_image, index) - gallery_image_info.persistence_adapter.save(gallery_image) - end - end - - def update_gallery_image_position(gallery, gallery_image) - if gallery_image_relation.sortable? - last_image = gallery.images.last - previous_position = last_image.nil? ? 0 : last_image.send(gallery_image_relation.sortable_field.to_sym) - if previous_position - new_position = previous_position + 1 - else - new_position = gallery.images.count - end - set_gallery_image_position(gallery_image, new_position) - end - end - - def set_gallery_image_position(gallery_image, position) - gallery_image.send(:"#{gallery_image_relation.sortable_field}=", position) - end - - end - end -end \ No newline at end of file diff --git a/app/services/rademade_admin/gallery_manager.rb b/app/services/rademade_admin/gallery_manager.rb new file mode 100644 index 00000000..ac7fe27a --- /dev/null +++ b/app/services/rademade_admin/gallery_manager.rb @@ -0,0 +1,92 @@ +module RademadeAdmin + class GalleryManager + + def initialize(class_name) + @class_name = class_name + end + + def upload_images(gallery_id, files) + gallery = gallery_info.query_adapter.find(gallery_id) + image_presenter = upload_gallery_images(files) + save_gallery_images(gallery, image_presenter.gallery_images) + image_presenter.gallery_images_html + end + + def crop_image(image_id, crop_data) + gallery_image = gallery_image_info.query_adapter.find(image_id) + uploader = gallery_image.image + image = uploader.crop_image(crop_data) + uploader.store!(image) + gallery_image_info.persistence_adapter.save(gallery_image) + uploader + end + + def remove_image(image_id) + gallery_image = gallery_image_info.query_adapter.find(image_id) + gallery_image_info.persistence_adapter.destroy(gallery_image) + end + + def sort_images(images) + sort_gallery_images images + end + + protected + + def gallery_info + @gallery_info ||= RademadeAdmin::Model::Graph.instance.model_info(@class_name) + end + + def gallery_image_data_item + @gallery_image_data_item ||= gallery_info.data_items.data_item(:images) + end + + def gallery_image_relation + @gallery_image_relation ||= gallery_image_data_item.relation + end + + def gallery_image_info + @gallery_image_info ||= RademadeAdmin::Model::Graph.instance.model_info(gallery_image_relation.to) + end + + def upload_gallery_images(images) + image_presenter = RademadeAdmin::Upload::ImagePresenter.new(gallery_image_info.persistence_adapter) + image_presenter.upload_gallery_images(images) + image_presenter + end + + def save_gallery_images(gallery, gallery_images) + gallery_image_data_item.set_data(gallery, gallery.images + gallery_images) + gallery_images.each do |gallery_image| + update_gallery_image_position(gallery, gallery_image) + gallery_image_info.persistence_adapter.save(gallery_image) + end + gallery_info.persistence_adapter.save(gallery) + end + + def sort_gallery_images(images) + images.each_with_index do |image_id, index| + gallery_image = gallery_image_info.query_adapter.find(image_id) + set_gallery_image_position(gallery_image, index) + gallery_image_info.persistence_adapter.save(gallery_image) + end + end + + def update_gallery_image_position(gallery, gallery_image) + if gallery_image_relation.sortable? + last_image = gallery.images.last + previous_position = last_image.nil? ? 0 : last_image.send(gallery_image_relation.sortable_field.to_sym) + if previous_position + new_position = previous_position + 1 + else + new_position = gallery.images.count + end + set_gallery_image_position(gallery_image, new_position) + end + end + + def set_gallery_image_position(gallery_image, position) + gallery_image.send(:"#{gallery_image_relation.sortable_field}=", position) + end + + end +end From 21ec768704e9ffbe92a9a9617c0aeb7bbe373758 Mon Sep 17 00:00:00 2001 From: xfearx Date: Tue, 5 Feb 2019 18:43:46 +0200 Subject: [PATCH 051/114] fixed related select --- app/helpers/rademade_admin/form_helper.rb | 8 ++------ app/inputs/rademade_admin/related_select_input.rb | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/helpers/rademade_admin/form_helper.rb b/app/helpers/rademade_admin/form_helper.rb index e9cf5efe..6e2610af 100644 --- a/app/helpers/rademade_admin/form_helper.rb +++ b/app/helpers/rademade_admin/form_helper.rb @@ -16,7 +16,7 @@ def admin_field(form, data_item, model_info) attrs = admin_default_params(name, model_info) .merge(field_params(data_item)) .merge(input_params(name)) - editable = can?(:update, @item) + editable = can?(:update, @item) && (!data_item.has_relation? || can?(:update, data_item.relation.to)) concat form.input(name, input_attr(attrs).merge({ editable: editable, destroyable: can?(:destroy, @item), @@ -116,11 +116,7 @@ def localized_value(getter, locale) end def can_read?(data_item) - if data_item.has_relation? - can?(:read, data_item.relation.to) - else - can?(:access_field, @item, data_item.name) - end + can?(:access_field, @item, data_item.name) && (!data_item.has_relation? || can?(:read, data_item.relation.to)) end end diff --git a/app/inputs/rademade_admin/related_select_input.rb b/app/inputs/rademade_admin/related_select_input.rb index 13eb3e0d..cf0487be 100644 --- a/app/inputs/rademade_admin/related_select_input.rb +++ b/app/inputs/rademade_admin/related_select_input.rb @@ -48,7 +48,7 @@ def reflection_data :destroyable => options[:destroyable], :disabled => options[:disabled] } - data[:'search-url'] = search_url if options[:editable] && search_url + data[:'search-url'] = search_url if search_url data[:'new-url'] = new_url if options[:editable] && new_url data end From 102647cf1b46c7da795fe9f60ce3d42440c84384 Mon Sep 17 00:00:00 2001 From: xfearx Date: Thu, 7 Feb 2019 11:46:50 +0200 Subject: [PATCH 052/114] fixed bugs --- app/assets/javascripts/app/select2/related/view.coffee | 4 +++- app/assets/javascripts/app/templates/related-item.jst.ejs | 2 +- app/services/rademade_admin/saver.rb | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/app/select2/related/view.coffee b/app/assets/javascripts/app/select2/related/view.coffee index 47669f4a..286c55a3 100644 --- a/app/assets/javascripts/app/select2/related/view.coffee +++ b/app/assets/javascripts/app/select2/related/view.coffee @@ -29,6 +29,8 @@ class @Select2Input.RelatedView extends Backbone.View render : () -> @$el.html @_getHtml(@model.toJSON()) @$el.addClass('is-draggable') if @isSortable() + _.each @model.attributes, (value, name) => + @$el.attr("data-#{name}", value) return this isSortable : () -> @@ -52,7 +54,7 @@ class @Select2Input.RelatedView extends Backbone.View _getHtml : (data) -> JST['app/templates/related-item'] _.extend isSortable : @isSortable() - isDeletable : @isDeletable(), + isDeletable : @isDeletable() isDuplicatable : @isDuplicatable() , data diff --git a/app/assets/javascripts/app/templates/related-item.jst.ejs b/app/assets/javascripts/app/templates/related-item.jst.ejs index 46ee3da7..55bd1e76 100644 --- a/app/assets/javascripts/app/templates/related-item.jst.ejs +++ b/app/assets/javascripts/app/templates/related-item.jst.ejs @@ -7,7 +7,7 @@ if (isDeletable) { %>
<%= I18n.t('rademade_admin.relation.destroy') %>
<% } if (isDuplicatable) { - %>
+ %>
<% } diff --git a/app/services/rademade_admin/saver.rb b/app/services/rademade_admin/saver.rb index 97fb4813..1f6d9ab5 100644 --- a/app/services/rademade_admin/saver.rb +++ b/app/services/rademade_admin/saver.rb @@ -2,7 +2,7 @@ module RademadeAdmin class Saver - attr_reader :item + attr_accessor :item # Initialization of model saver class # From f9735b86e2c8baff187502d20b1fa64bc53d4386 Mon Sep 17 00:00:00 2001 From: xfearx Date: Mon, 11 Feb 2019 19:38:33 +0200 Subject: [PATCH 053/114] fixes for ability --- app/assets/javascripts/app/select2/view.coffee | 2 ++ app/inputs/rademade_admin/related_select_input.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/select2/view.coffee b/app/assets/javascripts/app/select2/view.coffee index be0e29b1..0330acc8 100644 --- a/app/assets/javascripts/app/select2/view.coffee +++ b/app/assets/javascripts/app/select2/view.coffee @@ -14,6 +14,7 @@ class @Select2Input.View extends Backbone.View newUrl : @$item.data('newUrl') multiple : @$item.data('relMultiple') editable : @$item.data('editable') + disabled : @$item.data('disabled') destroyable : @$item.data('destroyable') initRelated : () -> @@ -43,6 +44,7 @@ class @Select2Input.View extends Backbone.View data : @_getData results : @_getResults ).unbind('change').bind 'change', @_onChange + @$item.select2('disable') if @$item.data('disabled') @_updateData() @model.get('related').on 'data-change', @_updateData @_appendAddButton() diff --git a/app/inputs/rademade_admin/related_select_input.rb b/app/inputs/rademade_admin/related_select_input.rb index cf0487be..18392eb3 100644 --- a/app/inputs/rademade_admin/related_select_input.rb +++ b/app/inputs/rademade_admin/related_select_input.rb @@ -46,7 +46,7 @@ def reflection_data :'rel-class' => related_to.to_s, :editable => options[:editable], :destroyable => options[:destroyable], - :disabled => options[:disabled] + :disabled => options[:disabled] || !options[:editable] } data[:'search-url'] = search_url if search_url data[:'new-url'] = new_url if options[:editable] && new_url From 491232aee73326dec5cf960b7f305b2169d1f639 Mon Sep 17 00:00:00 2001 From: xfearx Date: Tue, 12 Feb 2019 18:32:08 +0200 Subject: [PATCH 054/114] fixes for abilities --- app/assets/javascripts/app/select2/view.coffee | 1 - app/helpers/rademade_admin/form_helper.rb | 5 ++--- app/helpers/rademade_admin/menu_helper.rb | 6 +++++- app/inputs/rademade_admin/related_select_input.rb | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/app/select2/view.coffee b/app/assets/javascripts/app/select2/view.coffee index 0330acc8..590b129a 100644 --- a/app/assets/javascripts/app/select2/view.coffee +++ b/app/assets/javascripts/app/select2/view.coffee @@ -44,7 +44,6 @@ class @Select2Input.View extends Backbone.View data : @_getData results : @_getResults ).unbind('change').bind 'change', @_onChange - @$item.select2('disable') if @$item.data('disabled') @_updateData() @model.get('related').on 'data-change', @_updateData @_appendAddButton() diff --git a/app/helpers/rademade_admin/form_helper.rb b/app/helpers/rademade_admin/form_helper.rb index 6e2610af..7b968f3d 100644 --- a/app/helpers/rademade_admin/form_helper.rb +++ b/app/helpers/rademade_admin/form_helper.rb @@ -16,11 +16,10 @@ def admin_field(form, data_item, model_info) attrs = admin_default_params(name, model_info) .merge(field_params(data_item)) .merge(input_params(name)) - editable = can?(:update, @item) && (!data_item.has_relation? || can?(:update, data_item.relation.to)) concat form.input(name, input_attr(attrs).merge({ - editable: editable, + editable: can?(:update, @item) && (!data_item.has_relation? || can?(:update, data_item.relation.to)), destroyable: can?(:destroy, @item), - disabled: !editable + disabled: !can?(:update, @item) })) end end diff --git a/app/helpers/rademade_admin/menu_helper.rb b/app/helpers/rademade_admin/menu_helper.rb index d7002f17..a91277c8 100644 --- a/app/helpers/rademade_admin/menu_helper.rb +++ b/app/helpers/rademade_admin/menu_helper.rb @@ -48,7 +48,11 @@ def collect_children(menu_key) menu_key = menu_key.to_s unless @menu_data[menu_key].nil? @menu_data[menu_key].each do |model_info| - uri = current_ability.can?(:read, model_info.model) ? admin_list_uri(model_info) : nil + if current_ability.can?(:read, model_info.model) && current_ability.can?(:read_menu, model_info.model) + uri = admin_list_uri(model_info) + else + uri = nil + end menu << { :uri => uri, :name => model_info.item_name, diff --git a/app/inputs/rademade_admin/related_select_input.rb b/app/inputs/rademade_admin/related_select_input.rb index 18392eb3..cf0487be 100644 --- a/app/inputs/rademade_admin/related_select_input.rb +++ b/app/inputs/rademade_admin/related_select_input.rb @@ -46,7 +46,7 @@ def reflection_data :'rel-class' => related_to.to_s, :editable => options[:editable], :destroyable => options[:destroyable], - :disabled => options[:disabled] || !options[:editable] + :disabled => options[:disabled] } data[:'search-url'] = search_url if search_url data[:'new-url'] = new_url if options[:editable] && new_url From 18cc2840f73b8ebbf91012778f9315e2025cd750 Mon Sep 17 00:00:00 2001 From: xfearx Date: Wed, 13 Feb 2019 14:40:24 +0200 Subject: [PATCH 055/114] fixed add new(abilities) --- app/helpers/rademade_admin/form_helper.rb | 1 + app/inputs/rademade_admin/related_select_input.rb | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/helpers/rademade_admin/form_helper.rb b/app/helpers/rademade_admin/form_helper.rb index 7b968f3d..0f5a6071 100644 --- a/app/helpers/rademade_admin/form_helper.rb +++ b/app/helpers/rademade_admin/form_helper.rb @@ -17,6 +17,7 @@ def admin_field(form, data_item, model_info) .merge(field_params(data_item)) .merge(input_params(name)) concat form.input(name, input_attr(attrs).merge({ + addable: can?(:create, @item) && (!data_item.has_relation? || can?(:create, data_item.relation.to)), editable: can?(:update, @item) && (!data_item.has_relation? || can?(:update, data_item.relation.to)), destroyable: can?(:destroy, @item), disabled: !can?(:update, @item) diff --git a/app/inputs/rademade_admin/related_select_input.rb b/app/inputs/rademade_admin/related_select_input.rb index cf0487be..cf34dce2 100644 --- a/app/inputs/rademade_admin/related_select_input.rb +++ b/app/inputs/rademade_admin/related_select_input.rb @@ -44,12 +44,13 @@ def reflection_data data = { :'rel-multiple' => multiple?, :'rel-class' => related_to.to_s, + :addable => options[:addable], :editable => options[:editable], :destroyable => options[:destroyable], :disabled => options[:disabled] } data[:'search-url'] = search_url if search_url - data[:'new-url'] = new_url if options[:editable] && new_url + data[:'new-url'] = new_url if options[:addable] && new_url data end From 4e0399cbc79fa898e53620bdf9aa212b4f31859c Mon Sep 17 00:00:00 2001 From: xfearx Date: Tue, 5 Mar 2019 18:44:05 +0200 Subject: [PATCH 056/114] added more info for links in header of page --- app/assets/javascripts/app/content/view.coffee | 18 +++++++++++------- .../_layouts/content_item.html.erb | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/app/content/view.coffee b/app/assets/javascripts/app/content/view.coffee index 8e4788cd..b9606bd1 100644 --- a/app/assets/javascripts/app/content/view.coffee +++ b/app/assets/javascripts/app/content/view.coffee @@ -41,6 +41,9 @@ class @Content extends Backbone.View $el.find('[data-content-close]').bind 'click', (e) => @moveToContentItem $(e.currentTarget).closest('[data-content-item]').prev() + bindDocumentClick : () => + @bindClick($(document)) + bindHistoryBack : () -> $(window).bind 'popstate', (e) -> state = e.originalEvent.state @@ -51,15 +54,16 @@ class @Content extends Backbone.View history.pushState url : url, document.title, url @init : () -> - content = new Content() + content = new this() content.bindHistoryBack() + content.bindDocumentClick() content + @initInstance : () => + window.ContentInstance = @init() + @getInstance : () -> - instance = null - do () -> - instance ||= Content.init() + window.ContentInstance -$ -> - $(document).on 'page:load ready', () -> - Content.getInstance().bindClick $(document) + $ -> + $(document).on 'page:load ready', Content.initInstance diff --git a/app/views/rademade_admin/_layouts/content_item.html.erb b/app/views/rademade_admin/_layouts/content_item.html.erb index d565f550..f978f17f 100644 --- a/app/views/rademade_admin/_layouts/content_item.html.erb +++ b/app/views/rademade_admin/_layouts/content_item.html.erb @@ -7,7 +7,7 @@ else url = admin_url_for(url_params) end %>
-
+
<%= content_header %>
<% From 43bfbb84b4f246213d8143d20f5084e6d77ffb81 Mon Sep 17 00:00:00 2001 From: xfearx Date: Thu, 14 Mar 2019 18:10:03 +0200 Subject: [PATCH 057/114] changed limit --- app/assets/javascripts/app/select2/view.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/select2/view.coffee b/app/assets/javascripts/app/select2/view.coffee index 590b129a..8869fbc4 100644 --- a/app/assets/javascripts/app/select2/view.coffee +++ b/app/assets/javascripts/app/select2/view.coffee @@ -1,6 +1,6 @@ class @Select2Input.View extends Backbone.View - resultLimit = 10 + resultLimit = 20 initItem : () -> @$item = @$el.find('[data-rel-multiple]') From 50f5d4e08d94e65d2a9a47c3da9b032e25316de4 Mon Sep 17 00:00:00 2001 From: Praffesor Date: Tue, 9 Apr 2019 18:37:05 +0300 Subject: [PATCH 058/114] added availabilty to hide index tab for form --- app/views/rademade_admin/_blocks/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/rademade_admin/_blocks/_form.html.erb b/app/views/rademade_admin/_blocks/_form.html.erb index 25053e5e..ae914430 100644 --- a/app/views/rademade_admin/_blocks/_form.html.erb +++ b/app/views/rademade_admin/_blocks/_form.html.erb @@ -1,5 +1,5 @@ <% -if @with_layout +if @with_layout && !@without_index_tab content_url = admin_list_uri(@model_info) concat render :template => @template_service.content_item_layout, :locals => { :content_header => @model_info.item_name, From 37c745e604bf1d6dcd32237ce9887447d1365268 Mon Sep 17 00:00:00 2001 From: Praffesor Date: Wed, 10 Apr 2019 11:36:07 +0300 Subject: [PATCH 059/114] updated content cancel behaviour --- app/assets/javascripts/app/content/view.coffee | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/content/view.coffee b/app/assets/javascripts/app/content/view.coffee index b9606bd1..96b0fae7 100644 --- a/app/assets/javascripts/app/content/view.coffee +++ b/app/assets/javascripts/app/content/view.coffee @@ -1,9 +1,13 @@ class @Content extends Backbone.View + isLoadingContentItem = false + renderItemFromUrl : (url, cb, urlData = {}) -> + return if isLoadingContentItem return if url == '' $(document).trigger 'before-content-render' @_updateHistory(url) + isLoadingContentItem = true $.get url, _.extend(urlData, layout : false), (html) => $contentItem = $(html) $('[data-content]').append $contentItem @@ -11,6 +15,7 @@ class @Content extends Backbone.View $(document).trigger 'init-plugins' @bindClick $contentItem cb($contentItem) if cb + isLoadingContentItem = false renderModel : (model, urlData = {}) -> @renderItemFromUrl model.get('editurl'), ($contentItem) => @@ -26,7 +31,6 @@ class @Content extends Backbone.View if $contentItem.length is 0 window.history.back() if window.history.length > 2 else - return if $contentItem.is(':last-child') $contentItem.nextAll('[data-content-item]').remove() if $contentItem.is(':first-child') @renderItemFromUrl $contentItem.data('contentItem'), () -> @@ -39,7 +43,12 @@ class @Content extends Backbone.View @renderItemFromUrl $(e.currentTarget).data('contentUrl') false $el.find('[data-content-close]').bind 'click', (e) => - @moveToContentItem $(e.currentTarget).closest('[data-content-item]').prev() + $contentItem = $(e.currentTarget).closest('[data-content-item]') + $prevContentItem = $contentItem.prev() + if $prevContentItem.length is 0 + @moveToContentItem $contentItem + else + @moveToContentItem $prevContentItem bindDocumentClick : () => @bindClick($(document)) From d60d7a65ef4ac139d4ad7b31eec762e67dac1382 Mon Sep 17 00:00:00 2001 From: xfearx Date: Thu, 9 May 2019 15:39:03 +0300 Subject: [PATCH 060/114] fixed bug with delete icon --- app/inputs/rademade_admin/file_input.rb | 2 +- .../rademade_admin/upload/preview/file_preview.rb | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/inputs/rademade_admin/file_input.rb b/app/inputs/rademade_admin/file_input.rb index 8d0c451b..8093d37b 100644 --- a/app/inputs/rademade_admin/file_input.rb +++ b/app/inputs/rademade_admin/file_input.rb @@ -35,7 +35,7 @@ def holder_html(inner_html, hidden = false) end def file_preview_html - template.content_tag(:div, upload_preview_service.preview_html, :class => 'upload-item') + template.content_tag(:div, upload_preview_service.preview_html(options.slice(:editable, :destroyable)), :class => 'upload-item') end def upload_button_html diff --git a/app/services/rademade_admin/upload/preview/file_preview.rb b/app/services/rademade_admin/upload/preview/file_preview.rb index e8e21a8c..630770c1 100644 --- a/app/services/rademade_admin/upload/preview/file_preview.rb +++ b/app/services/rademade_admin/upload/preview/file_preview.rb @@ -10,15 +10,17 @@ def initialize(uploader) @uploader = uploader end - def preview_html - content_tag(:div, uploaded_file_html, :data => { :preview_item => '' }) + def preview_html(options = {}) + content_tag(:div, uploaded_file_html(options), :data => { :preview_item => '' }) end - def uploaded_file_html + def uploaded_file_html(options = {}) if @uploader.blank? || @uploader.size.zero? '' else - content_tag(:div, HtmlBuffer.new([uploaded_preview_html, remove_ico_html])) + html_elements = [uploaded_preview_html] + html_elements << remove_ico_html if options[:destroyable] + content_tag(:div, HtmlBuffer.new(html_elements)) end end From a757f9e26f5cae876adb4d622a1400503876e26b Mon Sep 17 00:00:00 2001 From: xfearx Date: Thu, 30 May 2019 13:08:07 +0300 Subject: [PATCH 061/114] fixed versions --- Bowerfile | 20 ++++++++++---------- Gemfile | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Bowerfile b/Bowerfile index 91406a1b..81d76fc8 100644 --- a/Bowerfile +++ b/Bowerfile @@ -1,16 +1,16 @@ assets_path 'assets/javascript' -asset 'underscore' -asset 'backbone' +asset 'underscore', '1.9.1' +asset 'backbone', '1.4.0' asset 'backbone-notifier', :github => 'ewebdev/backbone.notifier#v0.2.4' asset 'wysihtml5', :github => 'xing/wysihtml5' -asset 'leaflet' +asset 'leaflet', '1.0.0' # jQuery -asset 'data-tables', :github => 'DataTables/DataTables' -asset 'flot', :github => 'flot/flot#v0.8.3' -asset 'knob', :github => 'aterrien/jQuery-Knob' +asset 'data-tables', :github => 'DataTables/DataTables', :ref => '1.10.19' +asset 'flot', '0.8.3' +asset 'knob', :github => 'aterrien/jQuery-Knob', :ref => '1.2.13' asset 'uniform', :github => 'AudithSoftworks/Uniform' asset 'jquery-ui', :github => 'jquery/jquery-ui#1.11.4' asset 'jquery-filthypillow', :github => 'Rademade/jquery.filthypillow#master' @@ -20,14 +20,14 @@ asset 'jquery-ujs' # Images asset 'jcrop', :github => 'tapmodo/Jcrop#v0.9.12' -asset 'jquery-fileupload', :github => 'blueimp/jQuery-File-Upload' +asset 'jquery-fileupload', :github => 'blueimp/jQuery-File-Upload', :ref => 'v9.12.6' # List -asset 'TableDnD' +asset 'TableDnD', '0.9.2' # Form -asset 'moment' -asset 'jquery-form', :github => 'malsup/form' +asset 'moment', '2.24.0' +asset 'jquery-form', :github => 'malsup/form', :ref => 'v4.0.0' asset 'jquery-serialize', :github => 'macek/jquery-serialize-object' asset 'jquery-formrestrict', :github => 'treyhunner/jquery-formrestrict' asset 'jquery-validation', :github => 'jzaefferer/jquery-validation#v1.13.1' diff --git a/Gemfile b/Gemfile index 06832a3d..5989f42a 100644 --- a/Gemfile +++ b/Gemfile @@ -10,6 +10,7 @@ end group :test do gem 'coveralls', :require => false + gem 'ckeditor', '~> 4.0' # Uploaders gem 'carrierwave' From 44131b468df7b6f5cb84251f1747ccc82de3ba7e Mon Sep 17 00:00:00 2001 From: xfearx Date: Wed, 5 Jun 2019 18:43:56 +0300 Subject: [PATCH 062/114] fixed bug for disabling field --- app/helpers/rademade_admin/form_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/rademade_admin/form_helper.rb b/app/helpers/rademade_admin/form_helper.rb index 0f5a6071..ba4054b5 100644 --- a/app/helpers/rademade_admin/form_helper.rb +++ b/app/helpers/rademade_admin/form_helper.rb @@ -16,12 +16,12 @@ def admin_field(form, data_item, model_info) attrs = admin_default_params(name, model_info) .merge(field_params(data_item)) .merge(input_params(name)) - concat form.input(name, input_attr(attrs).merge({ + concat form.input(name, { addable: can?(:create, @item) && (!data_item.has_relation? || can?(:create, data_item.relation.to)), editable: can?(:update, @item) && (!data_item.has_relation? || can?(:update, data_item.relation.to)), destroyable: can?(:destroy, @item), disabled: !can?(:update, @item) - })) + }.merge(input_attr(attrs))) end end From 98eae6093e9da3d0bcb2ae397fbc1c16af4ef9d1 Mon Sep 17 00:00:00 2001 From: xfearx Date: Fri, 7 Jun 2019 11:34:48 +0300 Subject: [PATCH 063/114] fixed sortable --- app/services/rademade_admin/model/adapter/data/sequel_data.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/rademade_admin/model/adapter/data/sequel_data.rb b/app/services/rademade_admin/model/adapter/data/sequel_data.rb index f29f437a..701928e4 100644 --- a/app/services/rademade_admin/model/adapter/data/sequel_data.rb +++ b/app/services/rademade_admin/model/adapter/data/sequel_data.rb @@ -37,7 +37,7 @@ def _map_relations to_class = RademadeAdmin::LoaderService.const_get(relation_info[:class_name]) rescue nil has_many = has_many_relations.include?(relation_info[:type]) getter = name - is_sortable = to_class ? to_class.columns.include?(:position) : false + is_sortable = to_class ? to_class.columns.include?(:position) && relation_info[:type] != :many_to_many : false relations[name] = _relation_class_name(to_class).new({ :name => name, :from => @model, From 7d6c6e182bf65273f34a8cfd87a42bd520bd43c2 Mon Sep 17 00:00:00 2001 From: xfearx Date: Wed, 12 Jun 2019 16:08:59 +0300 Subject: [PATCH 064/114] added redirect url for logged out users --- app/assets/javascripts/app/forms/login.coffee | 6 +++++- app/controllers/rademade_admin/abstract_controller.rb | 5 ++++- app/controllers/rademade_admin/sessions_controller.rb | 10 ++++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/app/forms/login.coffee b/app/assets/javascripts/app/forms/login.coffee index 53120f3a..0138e2b7 100644 --- a/app/assets/javascripts/app/forms/login.coffee +++ b/app/assets/javascripts/app/forms/login.coffee @@ -1,4 +1,8 @@ $(document).on 'ready page:load', -> $('#login-form').on - 'ajax-submit-done': -> window.location.reload() \ No newline at end of file + 'ajax-submit-done': (event, data) -> + if data.redirect_url + window.location.href = data.redirect_url + else + window.location.reload() diff --git a/app/controllers/rademade_admin/abstract_controller.rb b/app/controllers/rademade_admin/abstract_controller.rb index 9aaccbd7..dd0f7665 100644 --- a/app/controllers/rademade_admin/abstract_controller.rb +++ b/app/controllers/rademade_admin/abstract_controller.rb @@ -19,7 +19,10 @@ class AbstractController < ActionController::Base protected def require_login - redirect_to login_url unless admin_logged_in? + unless admin_logged_in? + session[:redirect_after] = request.url + redirect_to rademade_admin_route(:login_url) + end end def init_data diff --git a/app/controllers/rademade_admin/sessions_controller.rb b/app/controllers/rademade_admin/sessions_controller.rb index 00b112c8..a43c32d9 100644 --- a/app/controllers/rademade_admin/sessions_controller.rb +++ b/app/controllers/rademade_admin/sessions_controller.rb @@ -7,9 +7,15 @@ class SessionsController < RademadeAdmin::ApplicationController def login user = RademadeAdmin::Login.admin(params) session[:user_id] = user.id.to_s + if session[:redirect_after].present? + redirect_url = session[:redirect_after] + session[:redirect_after] = nil + else + redirect_url = { :controller => 'dashboard', :action => 'index' } + end respond_to do |format| - format.html { redirect_to :controller => 'dashboard', :action => 'index' } - format.json { render :json => user } + format.html { redirect_to redirect_url } + format.json { render :json => { redirect_url: redirect_url } } end rescue RademadeAdmin::Login::Error => e render :json => { :errors => e.field_messages }, :status => :precondition_failed From f151d59fc20b020e7b350f6fa417bd73b50205ee Mon Sep 17 00:00:00 2001 From: xfearx Date: Wed, 12 Jun 2019 16:31:04 +0300 Subject: [PATCH 065/114] fixed bug with object checking --- app/assets/javascripts/app/forms/login.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/forms/login.coffee b/app/assets/javascripts/app/forms/login.coffee index 0138e2b7..91ea9a3b 100644 --- a/app/assets/javascripts/app/forms/login.coffee +++ b/app/assets/javascripts/app/forms/login.coffee @@ -2,7 +2,7 @@ $(document).on 'ready page:load', -> $('#login-form').on 'ajax-submit-done': (event, data) -> - if data.redirect_url + if data.redirect_url && typeof data.redirect_url is 'string' window.location.href = data.redirect_url else window.location.reload() From 67126ceedca9a83181d99146806268c26518b7e8 Mon Sep 17 00:00:00 2001 From: xfearx Date: Tue, 6 Aug 2019 17:59:36 +0300 Subject: [PATCH 066/114] fix bug with relation --- app/services/rademade_admin/saver.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/rademade_admin/saver.rb b/app/services/rademade_admin/saver.rb index 1f6d9ab5..03072591 100644 --- a/app/services/rademade_admin/saver.rb +++ b/app/services/rademade_admin/saver.rb @@ -24,8 +24,8 @@ def find_model def set_data save_simple_fields save_localizable_fields - save_model_uploads save_item # save before setting relations + save_model_uploads save_model_relations end From 48a1e3ae475f762ef23456299d1c822e5f7991fa Mon Sep 17 00:00:00 2001 From: xfearx Date: Thu, 8 Aug 2019 20:24:31 +0300 Subject: [PATCH 067/114] fixed picture upload --- app/services/rademade_admin/saver.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/services/rademade_admin/saver.rb b/app/services/rademade_admin/saver.rb index 03072591..73d631b5 100644 --- a/app/services/rademade_admin/saver.rb +++ b/app/services/rademade_admin/saver.rb @@ -24,9 +24,10 @@ def find_model def set_data save_simple_fields save_localizable_fields - save_item # save before setting relations + save_item if @model_info.persistence_adapter.new?(item) # to init id save_model_uploads save_model_relations + save_item end def save_item @@ -88,6 +89,7 @@ def save_model_upload(data_item, image_path) else full_image_path = data_item.uploader.full_path_for(image_path) data_item.set_data(entity, File.open(full_image_path)) + item.public_send(data_item.getter)&.store! end end rescue From e0804a53a8c8851f9aecd8b4078a1e512ef18d71 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 21 Aug 2019 12:55:55 +0300 Subject: [PATCH 068/114] Add search_params for autocomplete field --- app/inputs/rademade_admin/related_select_input.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/inputs/rademade_admin/related_select_input.rb b/app/inputs/rademade_admin/related_select_input.rb index cf34dce2..adfa4efb 100644 --- a/app/inputs/rademade_admin/related_select_input.rb +++ b/app/inputs/rademade_admin/related_select_input.rb @@ -40,6 +40,11 @@ def html_attributes def reflection_data search_url = admin_autocomplete_uri(related_to, :format => :json) + + # add custom query params to autocomplete + params = related_data_item.form_params[:search_params] + search_url = params ? "#{search_url}?#{params.to_query}" : search_url + new_url = admin_new_form_uri(related_to) data = { :'rel-multiple' => multiple?, @@ -49,7 +54,7 @@ def reflection_data :destroyable => options[:destroyable], :disabled => options[:disabled] } - data[:'search-url'] = search_url if search_url + data[:'search-url'] = search_url data[:'new-url'] = new_url if options[:addable] && new_url data end From cdd30a927352542db90d2ffa234e9a4c17a6a88f Mon Sep 17 00:00:00 2001 From: xfearx Date: Thu, 28 Nov 2019 18:12:29 +0200 Subject: [PATCH 069/114] added event select2:select --- app/assets/javascripts/app/select2/view.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/app/select2/view.coffee b/app/assets/javascripts/app/select2/view.coffee index 8869fbc4..a50cdc1a 100644 --- a/app/assets/javascripts/app/select2/view.coffee +++ b/app/assets/javascripts/app/select2/view.coffee @@ -94,6 +94,7 @@ class @Select2Input.View extends Backbone.View @$item.val('') @model.get('related').clear() @$edit.hide() if @$edit + @$item.trigger 'select2:select' _createRelatedModel : (url) -> relatedModel = @_relatedModel url From 21725e67f2e7484dfa0d043acfd7827f4500ab38 Mon Sep 17 00:00:00 2001 From: xfearx Date: Thu, 6 Feb 2020 11:17:30 +0200 Subject: [PATCH 070/114] fixed event select2:select --- app/assets/javascripts/app/select2/view.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/app/select2/view.coffee b/app/assets/javascripts/app/select2/view.coffee index a50cdc1a..4809eeb9 100644 --- a/app/assets/javascripts/app/select2/view.coffee +++ b/app/assets/javascripts/app/select2/view.coffee @@ -101,6 +101,7 @@ class @Select2Input.View extends Backbone.View relatedModel.on 'data-change', () => @model.get('related').add(relatedModel) if @model.isMultiple() @_updateData() + @$item.trigger 'select2:select' relatedModel _updateData : () => From 57b9eeab377dd213b44fe57e1cd2b470cdfc34c2 Mon Sep 17 00:00:00 2001 From: xfearx Date: Mon, 24 Feb 2020 16:35:10 +0200 Subject: [PATCH 071/114] fixed sequel validation --- .../model/adapter/persistence.rb | 4 +- .../persistence/active_record_persistence.rb | 2 +- .../persistence/mongoid_persistence.rb | 2 +- .../adapter/persistence/sequel_persistence.rb | 16 ++- app/services/rademade_admin/saver.rb | 115 ++++++++++++++++++ 5 files changed, 133 insertions(+), 6 deletions(-) diff --git a/app/services/rademade_admin/model/adapter/persistence.rb b/app/services/rademade_admin/model/adapter/persistence.rb index 335c8130..243790ec 100644 --- a/app/services/rademade_admin/model/adapter/persistence.rb +++ b/app/services/rademade_admin/model/adapter/persistence.rb @@ -16,7 +16,7 @@ def new?(record) nil end - def save(record) + def save(record, options = {}) nil end @@ -27,4 +27,4 @@ def destroy(record) end end end -end \ No newline at end of file +end diff --git a/app/services/rademade_admin/model/adapter/persistence/active_record_persistence.rb b/app/services/rademade_admin/model/adapter/persistence/active_record_persistence.rb index 2d76c3be..9a70cc25 100644 --- a/app/services/rademade_admin/model/adapter/persistence/active_record_persistence.rb +++ b/app/services/rademade_admin/model/adapter/persistence/active_record_persistence.rb @@ -9,7 +9,7 @@ def new?(record) record.new_record? end - def save(record) + def save(record, options = {}) record.save! end diff --git a/app/services/rademade_admin/model/adapter/persistence/mongoid_persistence.rb b/app/services/rademade_admin/model/adapter/persistence/mongoid_persistence.rb index 6c196af0..8c9ef944 100644 --- a/app/services/rademade_admin/model/adapter/persistence/mongoid_persistence.rb +++ b/app/services/rademade_admin/model/adapter/persistence/mongoid_persistence.rb @@ -9,7 +9,7 @@ def new?(record) record.new_record? end - def save(record) + def save(record, options = {}) record.save! end diff --git a/app/services/rademade_admin/model/adapter/persistence/sequel_persistence.rb b/app/services/rademade_admin/model/adapter/persistence/sequel_persistence.rb index 7430722c..5f726d77 100644 --- a/app/services/rademade_admin/model/adapter/persistence/sequel_persistence.rb +++ b/app/services/rademade_admin/model/adapter/persistence/sequel_persistence.rb @@ -5,12 +5,24 @@ module Adapter class Persistence class SequelPersistence < RademadeAdmin::Model::Adapter::Persistence + def initialize(model) + @model = model + end + + def new_record + @model.new + end + def new?(record) record.new? end - def save(record) - record.save + def destroy(record) + record.destroy + end + + def save(record, options = {}) + record.save(options) end end diff --git a/app/services/rademade_admin/saver.rb b/app/services/rademade_admin/saver.rb index 73d631b5..d82de81b 100644 --- a/app/services/rademade_admin/saver.rb +++ b/app/services/rademade_admin/saver.rb @@ -1,5 +1,120 @@ # -*- encoding : utf-8 -*- module RademadeAdmin + class Saver + + attr_accessor :item + + # Initialization of model saver class + # + # @param model_info [RademadeAdmin::Model::Info] + # @param params [Hash] + # + def initialize(model_info, params) + @model_info, @params = model_info, params + end + + def create_model + @item = @model_info.persistence_adapter.new_record + end + + def find_model + @item = @model_info.query_adapter.find(@params[:id]) + end + + def set_data + save_simple_fields + save_localizable_fields + save_item(validate: false) if @model_info.persistence_adapter.new?(item) # to init id + save_model_uploads + save_model_relations + save_item + end + + def save_item(options = {}) + @model_info.persistence_adapter.save(item, options) + end + + private + + def save_simple_fields + simple_field_params.each do |field, value| + item.send(:"#{field}=", value) + end + end + + def save_localizable_fields + current_locale = I18n.locale + @model_info.data_items.localizable_fields.each do |_, data_item| + values = @params[:data].try(:[], data_item.name) + values.each do |locale, value| + I18n.locale = locale + if data_item.has_uploader? + save_model_upload(data_item, value) + else + data_item.set_data(item, value) + end + end if values + end + I18n.locale = current_locale + end + + def save_model_relations + data = @params[:data] + @model_info.data_items.related_fields.each do |_, data_item| + if data.has_key? data_item.name + data_item.set_data(item, find_entities(data_item, data[data_item.name])) + end + end + end + + def save_model_uploads + data = @params[:data] + @model_info.data_items.uploader_fields.each do |_, data_item| + name = data_item.name + save_model_upload(data_item, data[name]) if data.has_key?(name) + end + end + + def save_model_upload(data_item, image_path) + if item.try(:translation).respond_to? data_item.setter + entity = item.translation + else + entity = item + end + if image_path.blank? + item.instance_exec(&data_item.uploader.remove_proc) + else + if image_path.match /^http/ # is full path already + item.instance_exec(&data_item.uploader.remote_url_setter_proc(image_path)) + else + full_image_path = data_item.uploader.full_path_for(image_path) + data_item.set_data(entity, File.open(full_image_path)) + item.public_send(data_item.getter)&.store! + end + end + rescue + # rm_todo clear image + end + + def find_entities(data_item, ids) + if ids.kind_of? Array + ids.reject! { |id| id.empty? } + related_entities(data_item, ids) + else + ids.empty? ? nil : data_item.relation.related_entities(ids) + end + end + + def simple_field_params + @params.require(:data).slice(*@model_info.data_items.save_form_fields) + end + + def related_entities(data_item, ids) + ids.map { |id| data_item.relation.related_entities(id) } + end + + end +endmodule RademadeAdmin class Saver attr_accessor :item From 573cfd830be4564a7fabfdcb09b272048bbce80c Mon Sep 17 00:00:00 2001 From: xfearx Date: Mon, 24 Feb 2020 18:21:07 +0200 Subject: [PATCH 072/114] fixed sequel validation --- app/services/rademade_admin/saver.rb | 115 --------------------------- 1 file changed, 115 deletions(-) diff --git a/app/services/rademade_admin/saver.rb b/app/services/rademade_admin/saver.rb index d82de81b..361e5390 100644 --- a/app/services/rademade_admin/saver.rb +++ b/app/services/rademade_admin/saver.rb @@ -113,120 +113,5 @@ def related_entities(data_item, ids) ids.map { |id| data_item.relation.related_entities(id) } end - end -endmodule RademadeAdmin - class Saver - - attr_accessor :item - - # Initialization of model saver class - # - # @param model_info [RademadeAdmin::Model::Info] - # @param params [Hash] - # - def initialize(model_info, params) - @model_info, @params = model_info, params - end - - def create_model - @item = @model_info.persistence_adapter.new_record - end - - def find_model - @item = @model_info.query_adapter.find(@params[:id]) - end - - def set_data - save_simple_fields - save_localizable_fields - save_item if @model_info.persistence_adapter.new?(item) # to init id - save_model_uploads - save_model_relations - save_item - end - - def save_item - @model_info.persistence_adapter.save(item) - end - - private - - def save_simple_fields - simple_field_params.each do |field, value| - item.send(:"#{field}=", value) - end - end - - def save_localizable_fields - current_locale = I18n.locale - @model_info.data_items.localizable_fields.each do |_, data_item| - values = @params[:data].try(:[], data_item.name) - values.each do |locale, value| - I18n.locale = locale - if data_item.has_uploader? - save_model_upload(data_item, value) - else - data_item.set_data(item, value) - end - end if values - end - I18n.locale = current_locale - end - - def save_model_relations - data = @params[:data] - @model_info.data_items.related_fields.each do |_, data_item| - if data.has_key? data_item.name - data_item.set_data(item, find_entities(data_item, data[data_item.name])) - end - end - end - - def save_model_uploads - data = @params[:data] - @model_info.data_items.uploader_fields.each do |_, data_item| - name = data_item.name - save_model_upload(data_item, data[name]) if data.has_key?(name) - end - end - - def save_model_upload(data_item, image_path) - if item.try(:translation).respond_to? data_item.setter - entity = item.translation - else - entity = item - end - if image_path.blank? - item.instance_exec(&data_item.uploader.remove_proc) - else - if image_path.match /^http/ # is full path already - item.instance_exec(&data_item.uploader.remote_url_setter_proc(image_path)) - else - full_image_path = data_item.uploader.full_path_for(image_path) - data_item.set_data(entity, File.open(full_image_path)) - item.public_send(data_item.getter)&.store! - end - end - rescue - # rm_todo clear image - end - - def find_entities(data_item, ids) - if ids.kind_of? Array - ids.reject! { |id| id.empty? } - related_entities(data_item, ids) - else - ids.empty? ? nil : data_item.relation.related_entities(ids) - end - end - - def simple_field_params - @params.require(:data).slice(*@model_info.data_items.save_form_fields) - end - - def related_entities(data_item, ids) - ids.map { |id| data_item.relation.related_entities(id) } - end - end end From e3ed8f630a555bcd456391e5fdd680d64b3625b6 Mon Sep 17 00:00:00 2001 From: xfearx Date: Fri, 17 Jul 2020 17:12:45 +0300 Subject: [PATCH 073/114] Added ability to hide buttons on bottom --- app/views/rademade_admin/_blocks/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/rademade_admin/_blocks/_form.html.erb b/app/views/rademade_admin/_blocks/_form.html.erb index ae914430..e1667c45 100644 --- a/app/views/rademade_admin/_blocks/_form.html.erb +++ b/app/views/rademade_admin/_blocks/_form.html.erb @@ -20,7 +20,7 @@ end concat render @template_service.form_lang_panel_block, :f => form %>
<% - if !defined?(show_buttons) || show_buttons + if (!defined?(show_buttons) || show_buttons) && !@without_buttons %>
<% concat render buttons_template, :f => form From 5799c201531ae1b09e1196ec94f20dc755796f75 Mon Sep 17 00:00:00 2001 From: xfearx Date: Thu, 24 Sep 2020 19:04:49 +0300 Subject: [PATCH 074/114] Added clean validation after change value --- .../javascripts/form/form-validation.coffee | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/form/form-validation.coffee b/app/assets/javascripts/form/form-validation.coffee index a21c6f57..799e516e 100644 --- a/app/assets/javascripts/form/form-validation.coffee +++ b/app/assets/javascripts/form/form-validation.coffee @@ -57,12 +57,21 @@ class @FormValidation extends Backbone.View $.validator.setDefaults showErrors : (errorMap, errorList) => _.each errorList, (error) => - $holder = $(error.element).closest('.input-holder') + $element = $(error.element) + $holder = $element.closest('.input-holder') $holder.addClass 'in-error' $holder.append @_getErrorNotifier(error) + # todo once + $element.on 'input change select2:select', () -> + $holder.removeClass('in-error') + $holder.find('.error-message').remove() + if error.element.type == 'hidden' + $holder.on 'click', () -> + $holder.removeClass('in-error') + $holder.find('.error-message').remove() $('html, body').animate({ scrollTop : $holder.offset().top - 50 - }, 500); + }, 500) @_getErrorNotifier : (message) -> $([ @@ -76,4 +85,4 @@ class @FormValidation extends Backbone.View if $.isArray(error.message) error.message.join('
') else - error.message \ No newline at end of file + error.message From f49fde4ab364674d45bb6602f22a4a7bc191f6b9 Mon Sep 17 00:00:00 2001 From: Sergey Date: Wed, 7 Oct 2020 14:24:49 +0300 Subject: [PATCH 075/114] Add regex escape for regex filter --- app/services/rademade_admin/search/where.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/rademade_admin/search/where.rb b/app/services/rademade_admin/search/where.rb index 5d0bac51..9f095ded 100644 --- a/app/services/rademade_admin/search/where.rb +++ b/app/services/rademade_admin/search/where.rb @@ -8,7 +8,7 @@ def regex_filter(where_conditions, search) if search.present? and not @data_items.filter_fields.empty? query_where = RademadeAdmin::Search::Part::Where.new(:or) @data_items.filter_fields.each do |field| - query_where.add(field, /#{search}/i) + query_where.add(field, /#{Regexp.escape(search)}/i) end where_conditions.sub_add(query_where) end @@ -17,4 +17,4 @@ def regex_filter(where_conditions, search) end end -end \ No newline at end of file +end From d90d58d49db6a3194693ba645792f035648f00ae Mon Sep 17 00:00:00 2001 From: Sergey Date: Wed, 21 Oct 2020 10:15:18 +0300 Subject: [PATCH 076/114] Fixed destroyable for relation --- app/helpers/rademade_admin/form_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/rademade_admin/form_helper.rb b/app/helpers/rademade_admin/form_helper.rb index ba4054b5..b5b884f5 100644 --- a/app/helpers/rademade_admin/form_helper.rb +++ b/app/helpers/rademade_admin/form_helper.rb @@ -19,7 +19,7 @@ def admin_field(form, data_item, model_info) concat form.input(name, { addable: can?(:create, @item) && (!data_item.has_relation? || can?(:create, data_item.relation.to)), editable: can?(:update, @item) && (!data_item.has_relation? || can?(:update, data_item.relation.to)), - destroyable: can?(:destroy, @item), + destroyable: can?(:destroy, @item) || (data_item.has_relation? && can?(:destroy, data_item.relation.to)), disabled: !can?(:update, @item) }.merge(input_attr(attrs))) end From f1c46cbdfe0359cfe00362a81c694c56650e25b0 Mon Sep 17 00:00:00 2001 From: Sergey Date: Fri, 13 Nov 2020 15:08:45 +0200 Subject: [PATCH 077/114] Fix save for to many relations --- app/services/rademade_admin/saver.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/rademade_admin/saver.rb b/app/services/rademade_admin/saver.rb index 361e5390..73f5dd46 100644 --- a/app/services/rademade_admin/saver.rb +++ b/app/services/rademade_admin/saver.rb @@ -98,7 +98,7 @@ def save_model_upload(data_item, image_path) def find_entities(data_item, ids) if ids.kind_of? Array - ids.reject! { |id| id.empty? } + ids = ids.map { |sub_ids| sub_ids.split(',') }.flatten.reject { |id| id.empty? } related_entities(data_item, ids) else ids.empty? ? nil : data_item.relation.related_entities(ids) From 586063042ef047d5776bc7430bc369afa3d4bebc Mon Sep 17 00:00:00 2001 From: Sergey Date: Tue, 17 Nov 2020 11:50:17 +0200 Subject: [PATCH 078/114] fixed validation scroll --- app/assets/javascripts/form/form-validation.coffee | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/form/form-validation.coffee b/app/assets/javascripts/form/form-validation.coffee index 799e516e..bc3b75e2 100644 --- a/app/assets/javascripts/form/form-validation.coffee +++ b/app/assets/javascripts/form/form-validation.coffee @@ -56,6 +56,7 @@ class @FormValidation extends Backbone.View @initDefaults : () -> $.validator.setDefaults showErrors : (errorMap, errorList) => + wasScrolledToError = false _.each errorList, (error) => $element = $(error.element) $holder = $element.closest('.input-holder') @@ -69,9 +70,11 @@ class @FormValidation extends Backbone.View $holder.on 'click', () -> $holder.removeClass('in-error') $holder.find('.error-message').remove() - $('html, body').animate({ - scrollTop : $holder.offset().top - 50 - }, 500) + unless wasScrolledToError + wasScrolledToError = true + $('html, body').animate({ + scrollTop : $holder.offset().top - 50 + }, 500) @_getErrorNotifier : (message) -> $([ From 6857b7ad1910991bbad0616b5be622446d476445 Mon Sep 17 00:00:00 2001 From: Sergey Date: Mon, 4 Jan 2021 11:47:57 +0200 Subject: [PATCH 079/114] Added loader --- app/assets/javascripts/app/content/view.coffee | 2 ++ app/assets/javascripts/form/form-validation.coffee | 1 - app/views/rademade_admin/_layouts/main.html.erb | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/app/content/view.coffee b/app/assets/javascripts/app/content/view.coffee index 96b0fae7..f37a4e50 100644 --- a/app/assets/javascripts/app/content/view.coffee +++ b/app/assets/javascripts/app/content/view.coffee @@ -7,6 +7,7 @@ class @Content extends Backbone.View return if url == '' $(document).trigger 'before-content-render' @_updateHistory(url) + $('#loader').removeClass('hide') isLoadingContentItem = true $.get url, _.extend(urlData, layout : false), (html) => $contentItem = $(html) @@ -16,6 +17,7 @@ class @Content extends Backbone.View @bindClick $contentItem cb($contentItem) if cb isLoadingContentItem = false + $('#loader').addClass('hide') renderModel : (model, urlData = {}) -> @renderItemFromUrl model.get('editurl'), ($contentItem) => diff --git a/app/assets/javascripts/form/form-validation.coffee b/app/assets/javascripts/form/form-validation.coffee index bc3b75e2..b96b6418 100644 --- a/app/assets/javascripts/form/form-validation.coffee +++ b/app/assets/javascripts/form/form-validation.coffee @@ -62,7 +62,6 @@ class @FormValidation extends Backbone.View $holder = $element.closest('.input-holder') $holder.addClass 'in-error' $holder.append @_getErrorNotifier(error) - # todo once $element.on 'input change select2:select', () -> $holder.removeClass('in-error') $holder.find('.error-message').remove() diff --git a/app/views/rademade_admin/_layouts/main.html.erb b/app/views/rademade_admin/_layouts/main.html.erb index b6edf9c5..b8b176be 100644 --- a/app/views/rademade_admin/_layouts/main.html.erb +++ b/app/views/rademade_admin/_layouts/main.html.erb @@ -4,7 +4,7 @@
-
+
<% concat render @template_service.navigation_block %>
@@ -20,4 +20,4 @@ I18n.fallbacks = true; <% end %> - \ No newline at end of file + From c54a0fe4ca7827c3d105d78a8add35c97493c1be Mon Sep 17 00:00:00 2001 From: Sergey Date: Mon, 4 Jan 2021 16:06:27 +0200 Subject: [PATCH 080/114] Possible fix of ancestors for string --- app/services/rademade_admin/model/graph.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/rademade_admin/model/graph.rb b/app/services/rademade_admin/model/graph.rb index 80133cb6..fd801cd9 100644 --- a/app/services/rademade_admin/model/graph.rb +++ b/app/services/rademade_admin/model/graph.rb @@ -34,7 +34,7 @@ def init_pairs def model_info(model) model_name = model.to_s @model_infos[model_name] ||= init_model_info({ - :model => model, + :model => model.is_a?(String) ? LoaderService.const_get(model) : model, :controller => default_controller(model_name) }) end From 7314ef0cf9a510fa1d18f6ac6446785f0c15e03f Mon Sep 17 00:00:00 2001 From: Sergey Date: Tue, 9 Feb 2021 16:01:16 +0200 Subject: [PATCH 081/114] improved file upload --- app/assets/javascripts/app/common/uploader.coffee | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/common/uploader.coffee b/app/assets/javascripts/app/common/uploader.coffee index 198cbc85..cc4c5c91 100644 --- a/app/assets/javascripts/app/common/uploader.coffee +++ b/app/assets/javascripts/app/common/uploader.coffee @@ -19,11 +19,15 @@ class @Uploader extends Backbone.View @showLoader() $form.submit().done @updateUploader always : @hideLoader + fail : (event, data) -> + errorMessage = data?._response?.jqXHR?.responseJSON?.error + window.notifier.notify(errorMessage) if errorMessage updateUploader : (result) => @$el.find('[data-preview-item]').replaceWith(result.html) @$el.find('.upload-holder.hide').removeClass('hide') @$hidden.val(result.file.url) + @$hidden.change() ImagePreview.initPlugin() showLoader : () -> @@ -38,6 +42,7 @@ class @Uploader extends Backbone.View @$el.find('.upload-holder:has([data-preview-item])').fadeOut 300, () -> $(this).addClass('hide').show() @$hidden.val('') + @$hidden.change() _getUploaderData : () -> uploaderData = _.pick @$uploader.data(), 'id', 'model', 'column', 'uploader' @@ -63,4 +68,4 @@ class @Uploader extends Backbone.View @initAll() $ -> - $(document).on 'page:load ready init-plugins', Uploader.initPlugin \ No newline at end of file + $(document).on 'page:load ready init-plugins', Uploader.initPlugin From a14bdb98fc8bfe11e8d281521f331ff89e010e8d Mon Sep 17 00:00:00 2001 From: Sergey Date: Thu, 11 Feb 2021 11:37:25 +0200 Subject: [PATCH 082/114] added simple styling for files --- .../stylesheets/blocks/form/file/_main.sass | 16 +++++++++++++++- app/inputs/rademade_admin/file_input.rb | 4 +++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/blocks/form/file/_main.sass b/app/assets/stylesheets/blocks/form/file/_main.sass index f577ba88..ce92dae7 100644 --- a/app/assets/stylesheets/blocks/form/file/_main.sass +++ b/app/assets/stylesheets/blocks/form/file/_main.sass @@ -4,4 +4,18 @@ +clear .upload-box - display: inline \ No newline at end of file + display: flex + + .upload-item.upload-item--file + height: 100% + padding: 5px + display: flex + justify-content: center + align-items: center + background-color: #F9FBFE + + a + color: rgb(102, 102, 102) + font-weight: bold + word-break: break-all + font-size: 14px diff --git a/app/inputs/rademade_admin/file_input.rb b/app/inputs/rademade_admin/file_input.rb index 8093d37b..c1a01125 100644 --- a/app/inputs/rademade_admin/file_input.rb +++ b/app/inputs/rademade_admin/file_input.rb @@ -35,7 +35,9 @@ def holder_html(inner_html, hidden = false) end def file_preview_html - template.content_tag(:div, upload_preview_service.preview_html(options.slice(:editable, :destroyable)), :class => 'upload-item') + class_name = 'upload-item' + class_name += ' upload-item--file' if !photo_uploader? && !video_uploader? + template.content_tag(:div, upload_preview_service.preview_html(options.slice(:editable, :destroyable)), :class => class_name) end def upload_button_html From 33a6217ea7707926cdfd323a9c122ba2d7191969 Mon Sep 17 00:00:00 2001 From: Sergey Date: Tue, 16 Mar 2021 09:57:53 +0200 Subject: [PATCH 083/114] added error display for gallery image upload --- app/assets/javascripts/app/gallery/view.coffee | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/gallery/view.coffee b/app/assets/javascripts/app/gallery/view.coffee index ff12eaf9..58f7bec9 100644 --- a/app/assets/javascripts/app/gallery/view.coffee +++ b/app/assets/javascripts/app/gallery/view.coffee @@ -21,6 +21,9 @@ class @Gallery extends Backbone.View @showLoader() $form.submit().done @_appendUploadResult stop : @hideLoader + error : (data) => + if data.responseJSON?.error + window.notifier.notify data.responseJSON.error showLoader : () -> @$loaderHolder.addClass('is-loading') @@ -50,4 +53,4 @@ class @Gallery extends Backbone.View @initAll() $ -> - $(document).on 'page:load ready init-plugins', Gallery.initPlugin \ No newline at end of file + $(document).on 'page:load ready init-plugins', Gallery.initPlugin From 646bf39c2d93249bfdead4f37ce63dc7920e38d7 Mon Sep 17 00:00:00 2001 From: Sergey Date: Tue, 23 Mar 2021 09:49:18 +0200 Subject: [PATCH 084/114] fixed file size error for file uploader --- app/services/rademade_admin/upload/preview/file_preview.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/services/rademade_admin/upload/preview/file_preview.rb b/app/services/rademade_admin/upload/preview/file_preview.rb index 630770c1..99b09b7c 100644 --- a/app/services/rademade_admin/upload/preview/file_preview.rb +++ b/app/services/rademade_admin/upload/preview/file_preview.rb @@ -71,8 +71,9 @@ def video_preview_html def file_preview_html file_path = @uploader.path - file_name = "#{::File.basename(file_path)}, #{number_to_human_size(::File.size(file_path))}" - content_tag(:a, file_name, download_params) + file_name_parts = [::File.basename(file_path)] + file_name_parts << number_to_human_size(::File.size(file_path)) rescue nil + content_tag(:a, file_name_parts.join(', '), download_params) end def crop_url From 8a70f6358ef5fa2c2b4b0481d58471426dca99a6 Mon Sep 17 00:00:00 2001 From: Sergey Date: Mon, 29 Mar 2021 17:49:14 +0300 Subject: [PATCH 085/114] added rerender for empty content items --- app/assets/javascripts/app/content/view.coffee | 2 +- app/views/rademade_admin/_blocks/table/_list.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/content/view.coffee b/app/assets/javascripts/app/content/view.coffee index f37a4e50..6f20245e 100644 --- a/app/assets/javascripts/app/content/view.coffee +++ b/app/assets/javascripts/app/content/view.coffee @@ -34,7 +34,7 @@ class @Content extends Backbone.View window.history.back() if window.history.length > 2 else $contentItem.nextAll('[data-content-item]').remove() - if $contentItem.is(':first-child') + if $contentItem.is(':first-child') || !$contentItem.has('.content-data').length @renderItemFromUrl $contentItem.data('contentItem'), () -> $contentItem.remove() diff --git a/app/views/rademade_admin/_blocks/table/_list.html.erb b/app/views/rademade_admin/_blocks/table/_list.html.erb index cdb3bb3b..7a0b7cac 100644 --- a/app/views/rademade_admin/_blocks/table/_list.html.erb +++ b/app/views/rademade_admin/_blocks/table/_list.html.erb @@ -31,4 +31,4 @@ is_sortable = @sortable_service.has_position? <% end -%> \ No newline at end of file +%> From 64a105f1fc3bd9bbd690e50d92180b39e94e6743 Mon Sep 17 00:00:00 2001 From: Sergey Date: Mon, 19 Apr 2021 18:45:20 +0300 Subject: [PATCH 086/114] added additional class names to list --- app/views/rademade_admin/_blocks/table/_head.html.erb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/rademade_admin/_blocks/table/_head.html.erb b/app/views/rademade_admin/_blocks/table/_head.html.erb index 6967015e..a71c67ae 100644 --- a/app/views/rademade_admin/_blocks/table/_head.html.erb +++ b/app/views/rademade_admin/_blocks/table/_head.html.erb @@ -1,7 +1,8 @@ <% @list_fields.each_with_index do |field, index| - %><% if index == 0 %> show-sdisplay<% end @@ -21,7 +22,8 @@ <%= field.label %> <% end - %> + additional_class_name = [@model.name, 'management'].join(' ').parameterize.dasherize + %> <%= t('rademade_admin.management.title') %><% if @sortable_service.can_reset? url_params = request.query_parameters.symbolize_keys.except(:sort, :direction) From ffdfaa9cf6c698b8b2ed59a7be98c9668ec66418 Mon Sep 17 00:00:00 2001 From: Sergey Date: Tue, 20 Apr 2021 10:26:17 +0300 Subject: [PATCH 087/114] removed turbolinks --- .../javascripts/app/common/turboform.coffee | 8 ----- .../javascripts/app/common/url-visitor.coffee | 6 ---- .../app/compatibility/turbolinks.coffee | 30 ------------------- .../javascripts/app/content/view.coffee | 3 +- app/assets/javascripts/rademade_admin.coffee | 1 - .../_layouts/parts/_head.html.erb | 6 ++-- lib/rademade_admin.rb | 1 - rademade_admin.gemspec | 1 - .../app/views/layouts/application.html.erb | 4 +-- 9 files changed, 6 insertions(+), 54 deletions(-) delete mode 100644 app/assets/javascripts/app/common/turboform.coffee delete mode 100644 app/assets/javascripts/app/common/url-visitor.coffee delete mode 100644 app/assets/javascripts/app/compatibility/turbolinks.coffee diff --git a/app/assets/javascripts/app/common/turboform.coffee b/app/assets/javascripts/app/common/turboform.coffee deleted file mode 100644 index 813e61f7..00000000 --- a/app/assets/javascripts/app/common/turboform.coffee +++ /dev/null @@ -1,8 +0,0 @@ -initTurboform = () -> - $('form[data-turboform]').on 'submit', () -> - separator = if @action.indexOf('?') is -1 then '?' else '&' - Turbolinks.visit @action + separator + $(this).serialize() - return false - -$ -> - $(document).on 'ready page:load init-plugins', initTurboform diff --git a/app/assets/javascripts/app/common/url-visitor.coffee b/app/assets/javascripts/app/common/url-visitor.coffee deleted file mode 100644 index 7c3fab7d..00000000 --- a/app/assets/javascripts/app/common/url-visitor.coffee +++ /dev/null @@ -1,6 +0,0 @@ -initUrlVisit = () -> - $('[data-link-url]').click () -> - Turbolinks.visit $(this).data('linkUrl') - -$ -> - $(document).on 'ready page:load init-plugins', initUrlVisit \ No newline at end of file diff --git a/app/assets/javascripts/app/compatibility/turbolinks.coffee b/app/assets/javascripts/app/compatibility/turbolinks.coffee deleted file mode 100644 index e26fbbfa..00000000 --- a/app/assets/javascripts/app/compatibility/turbolinks.coffee +++ /dev/null @@ -1,30 +0,0 @@ -{defer, dispatch} = Turbolinks - -handleEvent = (eventName, handler) -> - document.addEventListener(eventName, handler, false) - -translateEvent = ({from, to}) -> - handler = (event) -> - event = dispatch(to, target: event.target, cancelable: event.cancelable, data: event.data) - event.preventDefault() if event.defaultPrevented - handleEvent(from, handler) - -translateEvent from: "turbolinks:click", to: "page:before-change" -translateEvent from: "turbolinks:request-start", to: "page:fetch" -translateEvent from: "turbolinks:request-end", to: "page:receive" -translateEvent from: "turbolinks:before-cache", to: "page:before-unload" -translateEvent from: "turbolinks:render", to: "page:update" -translateEvent from: "turbolinks:load", to: "page:change" -translateEvent from: "turbolinks:load", to: "page:update" - -loaded = false -handleEvent "DOMContentLoaded", -> - defer -> - loaded = true -handleEvent "turbolinks:load", -> - if loaded - dispatch("page:load") - -jQuery?(document).on "ajaxSuccess", (event, xhr, settings) -> - if jQuery.trim(xhr.responseText).length > 0 - dispatch("page:update") diff --git a/app/assets/javascripts/app/content/view.coffee b/app/assets/javascripts/app/content/view.coffee index 6f20245e..ecbce147 100644 --- a/app/assets/javascripts/app/content/view.coffee +++ b/app/assets/javascripts/app/content/view.coffee @@ -57,8 +57,7 @@ class @Content extends Backbone.View bindHistoryBack : () -> $(window).bind 'popstate', (e) -> - state = e.originalEvent.state - window.location.href = state.url if state.url + window.location.reload() _updateHistory : (url) -> if history.pushState isnt undefined and $('[data-content-header]').length < 2 diff --git a/app/assets/javascripts/rademade_admin.coffee b/app/assets/javascripts/rademade_admin.coffee index 8042da40..4afd72b8 100644 --- a/app/assets/javascripts/rademade_admin.coffee +++ b/app/assets/javascripts/rademade_admin.coffee @@ -18,7 +18,6 @@ #= require TableDnD/js/jquery.tablednd #= require leaflet/dist/leaflet-src #= require moment/moment -#= require turbolinks #= require select2 #= require ckeditor/init #= require flot/jquery.flot diff --git a/app/views/rademade_admin/_layouts/parts/_head.html.erb b/app/views/rademade_admin/_layouts/parts/_head.html.erb index a453ecc2..debf700b 100644 --- a/app/views/rademade_admin/_layouts/parts/_head.html.erb +++ b/app/views/rademade_admin/_layouts/parts/_head.html.erb @@ -2,7 +2,7 @@ <%= favicon_link_tag('rademade_admin/fav1.ico') %> -<%= javascript_include_tag(:rademade_admin, 'data-turbolinks-track' => true) %> -<%= stylesheet_link_tag(:rademade_admin, :media => 'all', 'data-turbolinks-track' => true) %> +<%= javascript_include_tag(:rademade_admin) %> +<%= stylesheet_link_tag(:rademade_admin, :media => 'all') %> <%= yield(:head) if content_for?(:head) %> -<%= csrf_meta_tags %> \ No newline at end of file +<%= csrf_meta_tags %> diff --git a/lib/rademade_admin.rb b/lib/rademade_admin.rb index 16d407b3..603bcbb5 100644 --- a/lib/rademade_admin.rb +++ b/lib/rademade_admin.rb @@ -7,7 +7,6 @@ require 'configurations' # js assets -require 'turbolinks' require 'i18n-js' require 'simple_form' require 'ckeditor' diff --git a/rademade_admin.gemspec b/rademade_admin.gemspec index f5c57427..5fc852c0 100644 --- a/rademade_admin.gemspec +++ b/rademade_admin.gemspec @@ -37,7 +37,6 @@ Gem::Specification.new do |s| s.add_dependency 'ejs' # Public JS assets - s.add_dependency 'turbolinks' s.add_dependency 'jquery-rails' s.add_dependency 'select2-rails', '~> 3.5' diff --git a/spec/dummy/app/views/layouts/application.html.erb b/spec/dummy/app/views/layouts/application.html.erb index 670d1875..194d52bc 100644 --- a/spec/dummy/app/views/layouts/application.html.erb +++ b/spec/dummy/app/views/layouts/application.html.erb @@ -2,8 +2,8 @@ Dummy - <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> - <%= javascript_include_tag "application", "data-turbolinks-track" => true %> + <%= stylesheet_link_tag "application", media: "all" %> + <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> From 0ca8f4d03142d63e45762a3f1c96d29a5b6a74f3 Mon Sep 17 00:00:00 2001 From: Sergey Date: Thu, 22 Apr 2021 10:24:36 +0300 Subject: [PATCH 088/114] save gallery only on save --- .../app/gallery/image/collection-view.coffee | 9 +- .../app/gallery/image/collection.coffee | 12 --- .../app/gallery/image/model.coffee | 15 +-- .../javascripts/app/gallery/image/view.coffee | 7 +- .../javascripts/app/gallery/view.coffee | 31 ++++--- app/assets/javascripts/form/form-ajax.coffee | 10 ++ .../rademade_admin/gallery_controller.rb | 47 ---------- app/inputs/rademade_admin/gallery_input.rb | 39 ++++---- app/services/rademade_admin/base64_service.rb | 36 ++++++++ .../rademade_admin/gallery_manager.rb | 92 ------------------- app/services/rademade_admin/saver.rb | 48 +++++++++- .../rademade_admin/upload/image_presenter.rb | 38 -------- .../upload/preview/gallery_preview.rb | 23 ++--- 13 files changed, 148 insertions(+), 259 deletions(-) delete mode 100644 app/controllers/rademade_admin/gallery_controller.rb create mode 100644 app/services/rademade_admin/base64_service.rb delete mode 100644 app/services/rademade_admin/gallery_manager.rb delete mode 100644 app/services/rademade_admin/upload/image_presenter.rb diff --git a/app/assets/javascripts/app/gallery/image/collection-view.coffee b/app/assets/javascripts/app/gallery/image/collection-view.coffee index a014a0f7..5691e9df 100644 --- a/app/assets/javascripts/app/gallery/image/collection-view.coffee +++ b/app/assets/javascripts/app/gallery/image/collection-view.coffee @@ -7,12 +7,7 @@ class @GalleryImageCollectionView extends Backbone.View @_initImage $(image) initSort : () -> - sortUrl = @$el.data('sortableUrl') - if sortUrl - @images.setSortUrl sortUrl - @$el.sortable - stop : () => - @images.sort @_getSortedImages() + @$el.sortable() if @$el.data('sortable') addImage : ($image) -> @_initImage $image @@ -32,4 +27,4 @@ class @GalleryImageCollectionView extends Backbone.View el : $el collectionView.initImages className collectionView.initSort() - collectionView \ No newline at end of file + collectionView diff --git a/app/assets/javascripts/app/gallery/image/collection.coffee b/app/assets/javascripts/app/gallery/image/collection.coffee index f80f3a55..1c114d4d 100644 --- a/app/assets/javascripts/app/gallery/image/collection.coffee +++ b/app/assets/javascripts/app/gallery/image/collection.coffee @@ -5,15 +5,3 @@ class @GalleryImageCollection extends Backbone.Collection getClassName : () -> @className - - setSortUrl : (sortUrl) -> - @sortUrl = sortUrl - - sort : (images) -> - $.ajax - type : 'patch' - url : @sortUrl - data : - class_name : @className - images : images - dataType : 'json' \ No newline at end of file diff --git a/app/assets/javascripts/app/gallery/image/model.coffee b/app/assets/javascripts/app/gallery/image/model.coffee index fd15abbb..e64378b7 100644 --- a/app/assets/javascripts/app/gallery/image/model.coffee +++ b/app/assets/javascripts/app/gallery/image/model.coffee @@ -1,19 +1,10 @@ class @GalleryImageModel extends ImageModel remove : () -> - $.ajax - type : 'delete' - url : @get 'removeUrl' - data : - class_name : @collection.getClassName() - dataType : 'json' - success : () => - @collection.remove this - @trigger 'image-removed' - error : (data) => - window.notifier.notify data.error + @collection.remove this + @trigger 'image-removed' _getData : () -> data = super data.class_name = @collection.getClassName() - data \ No newline at end of file + data diff --git a/app/assets/javascripts/app/gallery/image/view.coffee b/app/assets/javascripts/app/gallery/image/view.coffee index ae5d5e08..e2386407 100644 --- a/app/assets/javascripts/app/gallery/image/view.coffee +++ b/app/assets/javascripts/app/gallery/image/view.coffee @@ -2,14 +2,14 @@ class @GalleryImageView extends Backbone.View events : 'click' : 'showPopup' - 'click [data-remove-url]' : 'remove' + 'click [data-remove]' : 'remove' initialize : () -> @model.on 'image-removed', @_onImageRemove @model.on 'change:resizedUrl', @_updateImageUrl remove : () -> - @model.remove() if confirm I18n.t('rademade_admin.remove_confirm.image') + @model.remove() false showPopup : () -> @@ -27,8 +27,7 @@ class @GalleryImageView extends Backbone.View @init : ($el) -> model = new GalleryImageModel $el.data() - model.set 'removeUrl', $el.find('[data-remove-url]').data('removeUrl') new GalleryImageView model : model el : $el - model \ No newline at end of file + model diff --git a/app/assets/javascripts/app/gallery/view.coffee b/app/assets/javascripts/app/gallery/view.coffee index 58f7bec9..950cb290 100644 --- a/app/assets/javascripts/app/gallery/view.coffee +++ b/app/assets/javascripts/app/gallery/view.coffee @@ -2,24 +2,35 @@ class @Gallery extends Backbone.View initUploadButton : () -> @$uploadButton = @$el.find('[type="file"]') - @galleryId = @$el.find('[type="hidden"]').val() @galleryClassName = @$uploadButton.data('class-name') @$loaderHolder = @$el.find('.upload-item.add') initCollectionView : () -> - @collectionView = GalleryImageCollectionView.init @$el.find('[data-sortable-url]'), @galleryClassName + @collectionView = GalleryImageCollectionView.init @$el.find('.upload-box'), @galleryClassName + # todo refactor bindUpload : () -> @$uploadButton.fileupload dataType : 'json' dropZone : @$el - url : @$uploadButton.data('url') - formData : - gallery_id : @galleryId - class_name : @galleryClassName - add : (e, $form) => + add : (e, data) => @showLoader() - $form.submit().done @_appendUploadResult + filesLeft = data.files.length + $.each data.files, (index, file) => + reader = new FileReader() + reader.readAsDataURL(file) + reader.onload = () => + # todo move template to view render + image = reader.result + imageHtml = "
+
+ + +
+
" + @collectionView.addImage $(imageHtml) + filesLeft-- + @hideLoader() if filesLeft <= 0 stop : @hideLoader error : (data) => if data.responseJSON?.error @@ -31,10 +42,6 @@ class @Gallery extends Backbone.View hideLoader : () => @$loaderHolder.removeClass('is-loading') - _appendUploadResult : (result) => - $.each result.gallery_images_html, (index, image_html) => - @collectionView.addImage $(image_html) - @init : ($el) -> gallery = new this el : $el diff --git a/app/assets/javascripts/form/form-ajax.coffee b/app/assets/javascripts/form/form-ajax.coffee index 02c7f53d..695ac79d 100644 --- a/app/assets/javascripts/form/form-ajax.coffee +++ b/app/assets/javascripts/form/form-ajax.coffee @@ -34,6 +34,16 @@ class @FormAjax extends Backbone.View array = items.data[memb] items.data[memb] = @_cleanArray(array) if $.isArray(array) + $('[data-gallery]').each () -> + $gallery = $(this) + galleryImages = [] + $gallery.find('[data-full-url]').each () -> + $galleryImage = $(this) + galleryImages.push + image_id: $galleryImage.data('imageId') + full_url: $galleryImage.data('fullUrl') + items.data["#{$gallery.data('gallery')}_images"] = galleryImages + inputMethod = @$el.find('input[name="_method"]') items['_method'] = inputMethod.val() if inputMethod instanceof jQuery diff --git a/app/controllers/rademade_admin/gallery_controller.rb b/app/controllers/rademade_admin/gallery_controller.rb deleted file mode 100644 index 513027f6..00000000 --- a/app/controllers/rademade_admin/gallery_controller.rb +++ /dev/null @@ -1,47 +0,0 @@ -# -*- encoding : utf-8 -*- -class RademadeAdmin::GalleryController < RademadeAdmin::ApplicationController - - def upload - render :json => { - :gallery_images_html => gallery_service.upload_images(params[:gallery_id], params[:files]) - } - rescue Exception => e - show_error(e) - end - - def crop - uploader = gallery_service.crop_image(params[:id], params[:crop]) - preview_service = RademadeAdmin::Upload::Preview::GalleryPreview.new - render :json => { - :image_data => preview_service.image_data(uploader), - :resized_url => preview_service.gallery_image_preview(uploader) - } - rescue Exception => e - show_error(e) - end - - def remove - gallery_service.remove_image(params[:id]) - render :json => { } - rescue Exception => e - show_error(e) - end - - def sort - gallery_service.sort_images(params[:images]) - render :json => { } - rescue Exception => e - show_error(e) - end - - private - - def show_error(error) - render :json => { :error => error.to_s }, :status => :unprocessable_entity - end - - def gallery_service - @gallery_service ||= RademadeAdmin::GalleryManager.new(params[:class_name]) - end - -end diff --git a/app/inputs/rademade_admin/gallery_input.rb b/app/inputs/rademade_admin/gallery_input.rb index c526625f..7fb0fbc2 100644 --- a/app/inputs/rademade_admin/gallery_input.rb +++ b/app/inputs/rademade_admin/gallery_input.rb @@ -8,8 +8,8 @@ def input(wrapper_options = {}) template.content_tag( :div, HtmlBuffer.new([gallery_block_html, upload_block_html, gallery_hidden_html]), - :class => 'upload-list', - :data => { :gallery => '' } + class: 'upload-list', + data: { gallery: gallery_info.getter } ) end @@ -18,9 +18,9 @@ def input(wrapper_options = {}) def gallery_block_html is_sortable = gallery_image_info.sortable_relation? template.content_tag(:div, images_html, - :class => 'upload-box', - :data => { - :sortable_url => is_sortable ? rademade_admin_route(:gallery_sort_url) : '' + class: 'upload-box', + data: { + sortable: is_sortable ? 'sortable' : nil # todo check sortable } ) end @@ -29,45 +29,44 @@ def images_html html = [] preview_service = RademadeAdmin::Upload::Preview::GalleryPreview.new gallery.images.each do |gallery_image| - html << preview_service.preview_html(gallery_image.image, options.slice(:editable, :destroyable)) - end + html << preview_service.preview_html( + gallery_image.image, + options.slice(:editable, :destroyable) + ) + end if gallery HtmlBuffer.new(html) end def upload_block_html if options[:editable] - template.content_tag(:div, upload_button_html, :class => 'upload-holder') + template.content_tag(:div, upload_button_html, class: 'upload-holder') end end def upload_button_html template.content_tag(:div, HtmlBuffer.new([ input_file_html, - template.content_tag(:span, t('rademade_admin.uploader.add.gallery'), :class => 'upload-text') - ]), :class => 'upload-item add') + template.content_tag(:span, t('rademade_admin.uploader.add.gallery'), class: 'upload-text') + ]), class: 'upload-item add') end def input_file_html template.content_tag(:input, '', - :type => 'file', - :multiple => true, - :data => { - :url => rademade_admin_route(:gallery_upload_url), - :class_name => gallery_class.to_s - } + type: 'file', + multiple: true ) end def gallery_hidden_html template.content_tag(:input, '', { - :type => 'hidden', - :name => "data[#{gallery_info.getter}]", - :value => gallery.id.to_s + type: 'hidden', + name: "data[#{gallery_info.getter}]", + value: gallery ? gallery.id.to_s : '' }) end def gallery - @gallery ||= object.send(attribute_name) || gallery_class.create + @gallery ||= object.send(attribute_name) end def gallery_info diff --git a/app/services/rademade_admin/base64_service.rb b/app/services/rademade_admin/base64_service.rb new file mode 100644 index 00000000..db281797 --- /dev/null +++ b/app/services/rademade_admin/base64_service.rb @@ -0,0 +1,36 @@ +# frozen_string_literal: true + +# https://gist.github.com/shrikanthkr/10097999 +module RademadeAdmin + class Base64Service + + def base64_to_file(image) + Base64.decode64(image) + if image + image_parts = image.split(',') + matches = /\/(.+);/.match(image_parts[0]) + extension = matches.nil? ? 'jpg' : matches[1] + image = file_decode(image_parts[1], "photo.#{extension}") + end + rescue + image + end + + def file_decode(base, filename) + file = Tempfile.new([file_base_name(filename), file_extension(filename)]) + file.binmode + file.write(Base64.decode64(base)) + file.close + file + end + + def file_base_name(file_name) + File.basename(file_name, file_extension(file_name)) + end + + def file_extension(file_name) + File.extname(file_name) + end + + end +end diff --git a/app/services/rademade_admin/gallery_manager.rb b/app/services/rademade_admin/gallery_manager.rb deleted file mode 100644 index ac7fe27a..00000000 --- a/app/services/rademade_admin/gallery_manager.rb +++ /dev/null @@ -1,92 +0,0 @@ -module RademadeAdmin - class GalleryManager - - def initialize(class_name) - @class_name = class_name - end - - def upload_images(gallery_id, files) - gallery = gallery_info.query_adapter.find(gallery_id) - image_presenter = upload_gallery_images(files) - save_gallery_images(gallery, image_presenter.gallery_images) - image_presenter.gallery_images_html - end - - def crop_image(image_id, crop_data) - gallery_image = gallery_image_info.query_adapter.find(image_id) - uploader = gallery_image.image - image = uploader.crop_image(crop_data) - uploader.store!(image) - gallery_image_info.persistence_adapter.save(gallery_image) - uploader - end - - def remove_image(image_id) - gallery_image = gallery_image_info.query_adapter.find(image_id) - gallery_image_info.persistence_adapter.destroy(gallery_image) - end - - def sort_images(images) - sort_gallery_images images - end - - protected - - def gallery_info - @gallery_info ||= RademadeAdmin::Model::Graph.instance.model_info(@class_name) - end - - def gallery_image_data_item - @gallery_image_data_item ||= gallery_info.data_items.data_item(:images) - end - - def gallery_image_relation - @gallery_image_relation ||= gallery_image_data_item.relation - end - - def gallery_image_info - @gallery_image_info ||= RademadeAdmin::Model::Graph.instance.model_info(gallery_image_relation.to) - end - - def upload_gallery_images(images) - image_presenter = RademadeAdmin::Upload::ImagePresenter.new(gallery_image_info.persistence_adapter) - image_presenter.upload_gallery_images(images) - image_presenter - end - - def save_gallery_images(gallery, gallery_images) - gallery_image_data_item.set_data(gallery, gallery.images + gallery_images) - gallery_images.each do |gallery_image| - update_gallery_image_position(gallery, gallery_image) - gallery_image_info.persistence_adapter.save(gallery_image) - end - gallery_info.persistence_adapter.save(gallery) - end - - def sort_gallery_images(images) - images.each_with_index do |image_id, index| - gallery_image = gallery_image_info.query_adapter.find(image_id) - set_gallery_image_position(gallery_image, index) - gallery_image_info.persistence_adapter.save(gallery_image) - end - end - - def update_gallery_image_position(gallery, gallery_image) - if gallery_image_relation.sortable? - last_image = gallery.images.last - previous_position = last_image.nil? ? 0 : last_image.send(gallery_image_relation.sortable_field.to_sym) - if previous_position - new_position = previous_position + 1 - else - new_position = gallery.images.count - end - set_gallery_image_position(gallery_image, new_position) - end - end - - def set_gallery_image_position(gallery_image, position) - gallery_image.send(:"#{gallery_image_relation.sortable_field}=", position) - end - - end -end diff --git a/app/services/rademade_admin/saver.rb b/app/services/rademade_admin/saver.rb index 73f5dd46..1e2fa79b 100644 --- a/app/services/rademade_admin/saver.rb +++ b/app/services/rademade_admin/saver.rb @@ -22,6 +22,7 @@ def find_model end def set_data + save_galleries save_simple_fields save_localizable_fields save_item(validate: false) if @model_info.persistence_adapter.new?(item) # to init id @@ -61,7 +62,7 @@ def save_localizable_fields def save_model_relations data = @params[:data] @model_info.data_items.related_fields.each do |_, data_item| - if data.has_key? data_item.name + if !data_item.gallery_relation? && data.has_key?(data_item.name) data_item.set_data(item, find_entities(data_item, data[data_item.name])) end end @@ -75,6 +76,51 @@ def save_model_uploads end end + def save_galleries + data = @params[:data] + @model_info.data_items.items.each do |_, data_item| + if data_item.gallery_relation? + name = data_item.name + if data.has_key? name + gallery_info = RademadeAdmin::Model::Graph.instance.model_info(data_item.relation.to) + gallery = gallery_info.query_adapter.find(data[name].to_i) + unless gallery + gallery = gallery_info.persistence_adapter.new_record + gallery_info.persistence_adapter.save(gallery) + @item.send(:"#{name}_id=", gallery.id) + end + save_gallery_images(gallery_info, gallery, data["#{name}_images"]) + end + end + end + end + + def save_gallery_images(gallery_info, gallery, images_data) + return unless images_data + gallery_image_data_item = gallery_info.data_items.data_item(:images) + gallery_image_relation = gallery_image_data_item.relation + gallery_image_info = RademadeAdmin::Model::Graph.instance.model_info(gallery_image_relation.to) + saved_gallery_images = [] + images_data.each do |index, image_data| + position = index.to_i + 1 + if image_data.has_key? :image_id + gallery_image = gallery_image_info.query_adapter.find(image_data[:image_id]) + gallery_image.update(gallery_image_relation.sortable_field => position) if gallery_image_relation.sortable? + else + gallery_image = gallery_image_info.persistence_adapter.new_record + gallery_image_info.persistence_adapter.save(gallery_image) + if gallery_image_relation.sortable? + gallery_image.public_send("#{gallery_image_relation.sortable_field}=", position) + end + gallery_image.image = ::RademadeAdmin::Base64Service.new.base64_to_file(image_data[:full_url]) + gallery_image.image.store! + gallery_image_info.persistence_adapter.save(gallery_image) + end + saved_gallery_images << gallery_image + end + gallery_image_data_item.set_data(gallery, saved_gallery_images) + end + def save_model_upload(data_item, image_path) if item.try(:translation).respond_to? data_item.setter entity = item.translation diff --git a/app/services/rademade_admin/upload/image_presenter.rb b/app/services/rademade_admin/upload/image_presenter.rb deleted file mode 100644 index ad1243f1..00000000 --- a/app/services/rademade_admin/upload/image_presenter.rb +++ /dev/null @@ -1,38 +0,0 @@ -# -*- encoding : utf-8 -*- -module RademadeAdmin - module Upload - class ImagePresenter - - attr_reader :gallery_images, :gallery_images_html - - def initialize(gallery_image_persistence_adapter) - @gallery_image_persistence_adapter = gallery_image_persistence_adapter - end - - def upload_gallery_images(images) - @gallery_images = [] - @gallery_images_html = [] - images.each { |image| add_gallery_image upload_gallery_image(image) } - end - - protected - - def upload_gallery_image(image) - gallery_image = @gallery_image_persistence_adapter.new_record - @gallery_image_persistence_adapter.save(gallery_image) - gallery_image.image.store! image - gallery_image - end - - def add_gallery_image(gallery_image) - @gallery_images << gallery_image - @gallery_images_html << preview_service.preview_html(gallery_image.image) - end - - def preview_service - @preview_service ||= RademadeAdmin::Upload::Preview::GalleryPreview.new - end - - end - end -end \ No newline at end of file diff --git a/app/services/rademade_admin/upload/preview/gallery_preview.rb b/app/services/rademade_admin/upload/preview/gallery_preview.rb index 40b526e4..aa8cf905 100644 --- a/app/services/rademade_admin/upload/preview/gallery_preview.rb +++ b/app/services/rademade_admin/upload/preview/gallery_preview.rb @@ -6,8 +6,8 @@ class GalleryPreview < RademadeAdmin::Upload::Preview def preview_html(uploader, options = { editable: true, destroyable: true }) content_tag(:div, image_item_html(uploader, options), - :class => 'upload-holder', - :data => image_data(uploader) + class: 'upload-holder', + data: image_data(uploader) ) end @@ -25,28 +25,23 @@ def crop_url def image_item_html(uploader, options) html_parts = [image_html(uploader)] - html_parts << remove_ico_html(uploader) if options[:destroyable] + html_parts << remove_ico_html if options[:destroyable] content_tag( :div, HtmlBuffer.new(html_parts), - :class => 'upload-item' + class: 'upload-item' ) end def image_html(uploader) - content_tag(:img, '', :src => gallery_image_preview(uploader)) + content_tag(:img, '', src: gallery_image_preview(uploader)) end - def remove_ico_html(uploader) + def remove_ico_html content_tag(:i, '', - :class => 'upload-delete', - :data => { - #todo use route name and resources - :remove_url => admin_url_for({ - :controller => 'rademade_admin/gallery', - :action => 'remove', - :id => uploader.model.id.to_s - }) + class: 'upload-delete', + data: { + remove: '' } ) end From ac2551227227857e423e05d6755c0ccedab1bf10 Mon Sep 17 00:00:00 2001 From: Sergey Date: Thu, 22 Apr 2021 10:28:11 +0300 Subject: [PATCH 089/114] removed gallery routes --- config/routes.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 30633143..23990405 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,12 +10,6 @@ match 'file-download/:model/:id/:uploader/:column' => 'file#download', :via => [:get] match 'file-crop' => 'file#crop', :via => [:post, :patch] - #todo via resources :gallery - match 'gallery-upload' => 'gallery#upload', :via => [:post, :patch] - match 'gallery-crop' => 'gallery#crop', :via => [:post, :patch] - match 'gallery-sort' => 'gallery#sort', :via => [:post, :patch] - match 'gallery-remove/:id' => 'gallery#remove', :via => [:delete] - match 'status/:model/:id' => 'status#toggle', :via => [:post, :patch] post 'sessions' => 'sessions#login' From 81085967fc1551fb114634c4bb0fcc5e297c8dd2 Mon Sep 17 00:00:00 2001 From: Sergey Date: Thu, 22 Apr 2021 19:07:55 +0300 Subject: [PATCH 090/114] removed crop --- app/services/rademade_admin/upload/preview.rb | 23 ++++--------------- .../upload/preview/gallery_preview.rb | 6 ----- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/app/services/rademade_admin/upload/preview.rb b/app/services/rademade_admin/upload/preview.rb index e12ad36d..8c9d8008 100644 --- a/app/services/rademade_admin/upload/preview.rb +++ b/app/services/rademade_admin/upload/preview.rb @@ -8,28 +8,13 @@ class Preview include UriHelper def image_data(uploader) - data = { - :image_id => uploader.model.id.to_s, - :full_url => uploader.url, - :name => uploader.file.try(:filename) - } - data[:crop] = crop_data(uploader) if uploader.class.ancestors.include? RademadeAdmin::Uploader::CropPhoto - data - end - - def crop_data(uploader) { - :url => crop_url, - :original_dimensions => uploader.original_dimensions.join(',') + image_id: uploader.model.id.to_s, + full_url: uploader.url, + name: uploader.file.try(:filename) } end - protected - - def crop_url - nil - end - end end -end \ No newline at end of file +end diff --git a/app/services/rademade_admin/upload/preview/gallery_preview.rb b/app/services/rademade_admin/upload/preview/gallery_preview.rb index aa8cf905..c72a4719 100644 --- a/app/services/rademade_admin/upload/preview/gallery_preview.rb +++ b/app/services/rademade_admin/upload/preview/gallery_preview.rb @@ -15,12 +15,6 @@ def gallery_image_preview(uploader) uploader.resize_with_crop(300, 300) end - protected - - def crop_url - rademade_admin_route(:gallery_crop_url) - end - private def image_item_html(uploader, options) From 02b7034ed7b9552040cb9396e88d46fc6b382b84 Mon Sep 17 00:00:00 2001 From: Sergey Date: Fri, 23 Apr 2021 14:10:10 +0300 Subject: [PATCH 091/114] fixed empty gallery --- app/assets/javascripts/form/form-ajax.coffee | 2 +- app/services/rademade_admin/saver.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/form/form-ajax.coffee b/app/assets/javascripts/form/form-ajax.coffee index 695ac79d..59e6ffa6 100644 --- a/app/assets/javascripts/form/form-ajax.coffee +++ b/app/assets/javascripts/form/form-ajax.coffee @@ -42,7 +42,7 @@ class @FormAjax extends Backbone.View galleryImages.push image_id: $galleryImage.data('imageId') full_url: $galleryImage.data('fullUrl') - items.data["#{$gallery.data('gallery')}_images"] = galleryImages + items.data["#{$gallery.data('gallery')}_images"] = if _.isEmpty(galleryImages) then [''] else galleryImages inputMethod = @$el.find('input[name="_method"]') items['_method'] = inputMethod.val() if inputMethod instanceof jQuery diff --git a/app/services/rademade_admin/saver.rb b/app/services/rademade_admin/saver.rb index 1e2fa79b..9beb4517 100644 --- a/app/services/rademade_admin/saver.rb +++ b/app/services/rademade_admin/saver.rb @@ -102,6 +102,7 @@ def save_gallery_images(gallery_info, gallery, images_data) gallery_image_info = RademadeAdmin::Model::Graph.instance.model_info(gallery_image_relation.to) saved_gallery_images = [] images_data.each do |index, image_data| + next unless image_data position = index.to_i + 1 if image_data.has_key? :image_id gallery_image = gallery_image_info.query_adapter.find(image_data[:image_id]) From 6a72330385ded0eff4aef3c1d29ae83603940b36 Mon Sep 17 00:00:00 2001 From: Sergey Date: Fri, 14 May 2021 17:58:12 +0300 Subject: [PATCH 092/114] fixed validation of gallery images --- app/services/rademade_admin/saver.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/services/rademade_admin/saver.rb b/app/services/rademade_admin/saver.rb index 9beb4517..7996921b 100644 --- a/app/services/rademade_admin/saver.rb +++ b/app/services/rademade_admin/saver.rb @@ -114,6 +114,7 @@ def save_gallery_images(gallery_info, gallery, images_data) gallery_image.public_send("#{gallery_image_relation.sortable_field}=", position) end gallery_image.image = ::RademadeAdmin::Base64Service.new.base64_to_file(image_data[:full_url]) + raise 'Image is not valid' if gallery_image.image.blank? gallery_image.image.store! gallery_image_info.persistence_adapter.save(gallery_image) end From 126bc5bc348ecf693421989b5e2c89a21b67b649 Mon Sep 17 00:00:00 2001 From: Sergey Date: Wed, 26 May 2021 10:56:13 +0300 Subject: [PATCH 093/114] added option to disable sort on index --- .../rademade_admin/model_controller.rb | 21 ++++++++++++------- .../_blocks/table/_list.html.erb | 2 +- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/controllers/rademade_admin/model_controller.rb b/app/controllers/rademade_admin/model_controller.rb index ed7c498b..b4c02e20 100644 --- a/app/controllers/rademade_admin/model_controller.rb +++ b/app/controllers/rademade_admin/model_controller.rb @@ -58,14 +58,8 @@ def autocomplete def index authorize! :read, model_class - respond_to do |format| - format.html { - @items = index_items - render_template - } - format.json { render :json => index_items(false) } - format.csv { render_csv(index_items(false)) } - end + @is_sortable_list = true + render_index end def new @@ -105,6 +99,17 @@ def sort protected # TODO move to search module + def render_index + respond_to do |format| + format.html { + @items = index_items + render_template + } + format.json { render :json => index_items(false) } + format.csv { render_csv(index_items(false)) } + end + end + def index_items(with_pagination = true) conditions = Search::Conditions::ListConditions.new(params, model_info.data_items) conditions.paginate = nil unless with_pagination diff --git a/app/views/rademade_admin/_blocks/table/_list.html.erb b/app/views/rademade_admin/_blocks/table/_list.html.erb index 7a0b7cac..5e730308 100644 --- a/app/views/rademade_admin/_blocks/table/_list.html.erb +++ b/app/views/rademade_admin/_blocks/table/_list.html.erb @@ -1,5 +1,5 @@ <% -is_sortable = @sortable_service.has_position? +is_sortable = @is_sortable_list && @sortable_service.has_position? %><% @items.each do |item| %> "#{name}_#{@item.id || unique_pseudo_id}" } } end @@ -99,7 +99,7 @@ def input_params(name) def localized_field_params(data_item, locale) { :input_html => { - :id => "#{data_item.getter}_#{locale}_#{@item.id}", + :id => "#{data_item.getter}_#{locale}_#{@item.id || unique_pseudo_id}", :value => localized_value(data_item.getter, locale) } } @@ -107,6 +107,11 @@ def localized_field_params(data_item, locale) private + # generate pseudo id for records without id (not created yet) + def unique_pseudo_id + DateTime.now.strftime('%Q') + rand.to_s + end + def localized_value(getter, locale) current_locale = I18n.locale I18n.locale = locale diff --git a/config/initializers/simple_form/wrappers.rb b/config/initializers/simple_form/wrappers.rb index 8ed86b7d..b4db5c00 100644 --- a/config/initializers/simple_form/wrappers.rb +++ b/config/initializers/simple_form/wrappers.rb @@ -4,7 +4,7 @@ form_box.use :html5 form_box.use :label, :class => 'form-label' form_box.wrapper :tag => 'span', :class => 'input-holder' do |input_holder| - input_holder.use :input, :autocomplete => 'new-password' + input_holder.use :input end form_box.wrapper :tag => 'div', :class => 'form-description', :unless_blank => true do |hint| hint.use :hint, :wrap_with => { :tag => :span, :class => :'form-description-text' } @@ -23,4 +23,4 @@ form_box.use :input, :autocomplete => 'new-password' end -end \ No newline at end of file +end From 15db5f40c1c8f52ead0ddf216a9695b37f242177 Mon Sep 17 00:00:00 2001 From: Sergey Date: Tue, 6 Jul 2021 09:20:49 +0300 Subject: [PATCH 097/114] added access field checks to list --- app/services/rademade_admin/model/info/data_items.rb | 2 +- app/views/rademade_admin/_blocks/table/_head.html.erb | 5 ++++- app/views/rademade_admin/_blocks/table/_list.html.erb | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/services/rademade_admin/model/info/data_items.rb b/app/services/rademade_admin/model/info/data_items.rb index 74b364d8..f22cc14b 100644 --- a/app/services/rademade_admin/model/info/data_items.rb +++ b/app/services/rademade_admin/model/info/data_items.rb @@ -133,4 +133,4 @@ def collect_field_names end end end -end \ No newline at end of file +end diff --git a/app/views/rademade_admin/_blocks/table/_head.html.erb b/app/views/rademade_admin/_blocks/table/_head.html.erb index a71c67ae..d7f7e8b8 100644 --- a/app/views/rademade_admin/_blocks/table/_head.html.erb +++ b/app/views/rademade_admin/_blocks/table/_head.html.erb @@ -1,6 +1,9 @@ - +<% +dummy_object = @model_info.persistence_adapter.new_record +%> <% @list_fields.each_with_index do |field, index| + next unless can?(:access_field, dummy_object, field.name) additional_class_name = [@model.name, field.name].join(' ').parameterize.dasherize %><% @list_fields.each_with_index do |field, index| + next unless can?(:access_field, item, field.name) is_first = index.zero? %> @@ -29,7 +29,7 @@ dummy_object = @model_info.persistence_adapter.new_record %> <%= t('rademade_admin.management.title') %><% if @sortable_service.can_reset? - url_params = request.query_parameters.symbolize_keys.except(:sort, :direction) + url_params = request.query_parameters.symbolize_keys.except(:sort, :direction, :layout) %> <%= t('rademade_admin.reset_sort') %> From 5c16b0de16b048b93c0b2f69bf7abc909128c381 Mon Sep 17 00:00:00 2001 From: Sergey Date: Tue, 3 Aug 2021 20:19:14 +0300 Subject: [PATCH 100/114] fixed styles for discard button --- app/assets/stylesheets/blocks/content/_table.sass | 8 ++++++++ app/views/rademade_admin/_blocks/table/_head.html.erb | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/blocks/content/_table.sass b/app/assets/stylesheets/blocks/content/_table.sass index fe211ec3..8a3604c7 100644 --- a/app/assets/stylesheets/blocks/content/_table.sass +++ b/app/assets/stylesheets/blocks/content/_table.sass @@ -113,6 +113,14 @@ opacity: .7 transform: translateY(-50%) +sprite(discard_red) + + & ~ .text + display: block + overflow: hidden + width: calc(100% - 25px) + white-space: nowrap + text-overflow: ellipsis + &:hover opacity: 1 .tooltip-holder diff --git a/app/views/rademade_admin/_blocks/table/_head.html.erb b/app/views/rademade_admin/_blocks/table/_head.html.erb index 89443883..f6c57d94 100644 --- a/app/views/rademade_admin/_blocks/table/_head.html.erb +++ b/app/views/rademade_admin/_blocks/table/_head.html.erb @@ -26,8 +26,7 @@ dummy_object = @model_info.persistence_adapter.new_record <% end additional_class_name = [@model.name, 'management'].join(' ').parameterize.dasherize - %> - <%= t('rademade_admin.management.title') %><% + %><% if @sortable_service.can_reset? url_params = request.query_parameters.symbolize_keys.except(:sort, :direction, :layout) %> @@ -36,6 +35,7 @@ dummy_object = @model_info.persistence_adapter.new_record <% end - %> + %><%= t('rademade_admin.management.title') %> + From c56164f49792fa380c3cfbe13dbd66462f1e3ebb Mon Sep 17 00:00:00 2001 From: Sergey Date: Mon, 9 Aug 2021 07:50:52 +0300 Subject: [PATCH 101/114] added additional form params --- app/helpers/rademade_admin/field_helper.rb | 2 +- app/helpers/rademade_admin/form_helper.rb | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/helpers/rademade_admin/field_helper.rb b/app/helpers/rademade_admin/field_helper.rb index ccf17908..8ac7956d 100644 --- a/app/helpers/rademade_admin/field_helper.rb +++ b/app/helpers/rademade_admin/field_helper.rb @@ -49,4 +49,4 @@ def input_attr(attrs = {}) ) end -end \ No newline at end of file +end diff --git a/app/helpers/rademade_admin/form_helper.rb b/app/helpers/rademade_admin/form_helper.rb index ccd1eab4..6c1f6632 100644 --- a/app/helpers/rademade_admin/form_helper.rb +++ b/app/helpers/rademade_admin/form_helper.rb @@ -40,10 +40,14 @@ def admin_form_options(record, model_info) url = admin_create_uri(model_info) form_class = 'insert-item-form' method = :post + save_type = :create + id = nil else url = admin_update_uri(record) form_class = 'update-item-form' method = :patch + save_type = :update + id = record.id end { :wrapper => :rademade, @@ -52,7 +56,10 @@ def admin_form_options(record, model_info) :as => :data, :html => admin_form_html_attributes(form_class), :data => { - :method => method + :method => method, + :model => record.model.to_s, + :save_type => save_type, + :id => id } } end From ab8c9ca964539926f7bc5ecfcf871af4478cd780 Mon Sep 17 00:00:00 2001 From: Sergey Date: Wed, 11 Aug 2021 12:12:57 +0300 Subject: [PATCH 102/114] added model to delete button --- app/views/rademade_admin/_blocks/button/_destroy.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/rademade_admin/_blocks/button/_destroy.html.erb b/app/views/rademade_admin/_blocks/button/_destroy.html.erb index c034de43..593edf4f 100644 --- a/app/views/rademade_admin/_blocks/button/_destroy.html.erb +++ b/app/views/rademade_admin/_blocks/button/_destroy.html.erb @@ -2,7 +2,7 @@ if can? :destroy, item delete_uri = admin_delete_uri(item) unless delete_uri.nil? - %><%= form_tag(delete_uri, :method => :delete, :class => 'inline-el', :data => { :'delete-item-form' => '' }) do + %><%= form_tag(delete_uri, :method => :delete, :class => 'inline-el', :data => { :'delete-item-form' => '', model: item.model.to_s }) do %>