sunrise-cms 1.1.0 → 2.0.0

data/app/controllers/sunrise/manager_controller.rb

@@ -4,15 +4,15 @@ module Sunrise
   class ManagerController < Sunrise::ApplicationController
     include Sunrise::Utils::SearchWrapper
 
-    before_action :build_record, only: [:new, :create]
-    before_action :find_record, only: [:show, :edit, :update, :destroy]
+    before_action :build_record, only: %i[new create]
+    before_action :find_record, only: %i[show edit update destroy]
     before_action :authorize_resource
 
     helper :all
     helper_method :abstract_model, :apply_scope, :scoped_index_path
 
     respond_to(*Sunrise::Config.navigational_formats)
-    respond_to :xml, :csv, :xlsx, only: [:export]
+    respond_to :json, :csv, :xlsx, only: %i[export]
 
     def index
       @records = abstract_model.apply_scopes(params)
@@ -29,7 +29,7 @@ module Sunrise
     end
 
     def new
-      @record.assign_attributes(abstract_model.model_params)
+      @record.assign_attributes(abstract_model.permit_model_params)
 
       respond_with(@record) do |format|
         format.html { render_with_scope }
@@ -37,7 +37,7 @@ module Sunrise
     end
 
     def create
-      @record.update_attributes(model_params)
+      @record.update(model_params)
       respond_with(@record, location: redirect_after_update(@record))
     end
 
@@ -48,7 +48,7 @@ module Sunrise
     end
 
     def update
-      @record.update_attributes(model_params)
+      @record.update(model_params)
       respond_with(@record, location: redirect_after_update(@record))
     end
 
@@ -64,8 +64,19 @@ module Sunrise
         format.xml  { render xml: @records }
         format.json { render json: @records }
         format.csv  { render abstract_model.export_options.merge(csv: @records) }
+      end
+    end
+
+    def import
+      return render plain: 'Unacceptable', status: 422 unless import_possible?
 
-        format.xlsx { render abstract_model.export_options.merge(xlsx: @records) } if defined?(Mime::XLSX)
+      @files = import_process_uploaded_files
+
+      respond_to do |format|
+        format.html { redirect_to scoped_index_path }
+        format.json do
+          render json: { files: @files }
+        end
       end
     end
 
@@ -89,6 +100,32 @@ module Sunrise
 
     protected
 
+    def import_process_uploaded_files
+      raw_files = params['files']
+      return [] if raw_files.blank?
+
+      raw_files.each_with_object([]) do |file, obj|
+        results = abstract_model.model.public_send(:sunrise_import, file)
+        results = render_imported_results(results, file)
+
+        obj << { name: file.original_filename, records: results }
+      end
+    end
+
+    def render_imported_results(results, file)
+      return results unless import_custom_render?
+
+      abstract_model.model.send(:sunrise_import_results_renderer, results, file)
+    end
+
+    def import_possible?
+      abstract_model.model.methods.include?(:sunrise_import)
+    end
+
+    def import_custom_render?
+      abstract_model.model.methods.include?(:sunrise_import_results_renderer)
+    end
+
     def find_model
       @abstract_model = Utils.get_model(params[:model_name], params)
       if @abstract_model.nil?

data/app/controllers/sunrise/settings_controller.rb

@@ -5,12 +5,11 @@ module Sunrise
     authorize_resource class: false
 
     def edit
-      @settings = Settings.get_all
-      respond_with(@settings)
+      @fields = Settings.defined_fields
     end
 
     def update
-      Settings.update_attributes(params[:settings])
+      Settings.update(params[:settings])
       redirect_to root_path
     end
   end

data/app/helpers/sunrise/structure_helper.rb

@@ -7,9 +7,9 @@ module Sunrise
 
       options = { parent_id: record.id, parent_type: 'Structure' }.merge(options)
 
-      case record.structure_type.kind
+      case record.structure_type.name
       when :page then edit_path(model_name: 'pages', id: record.id)
-      when :posts then index_path(options.merge(model_name: record.structure_type.kind))
+      when :posts then index_path(options.merge(model_name: record.structure_type.name))
       else edit_path(model_name: 'structures', id: record.id)
       end
     end

data/app/views/layouts/sunrise/application.html.erb

@@ -6,9 +6,12 @@
   <meta name="robots" content="NONE,NOARCHIVE" />
 	<%= csrf_meta_tag %>
   <title><%= t('manage.page_title') %></title>
-  
-  <%= stylesheet_link_tag "sunrise/application" %>
-  <%= javascript_include_tag "sunrise/application" %>
+
+  <%= stylesheet_link_tag 'sunrise/application' %>
+	<%= javascript_include_tag 'https://code.jquery.com/jquery-3.7.1.slim.min.js', integrity: 'sha256-kmHvs0B+OpCW5GVHUNjv9rOmY0IvSIRcf7zGUDTDQM8=', crossorigin: 'anonymous' %>
+	<%= javascript_include_tag 'https://cdnjs.cloudflare.com/ajax/libs/jquery-ujs/1.2.3/rails.min.js' %>
+  <%= javascript_include_tag 'sunrise/application' %>
+  <%#= javascript_include_tag ::Ckeditor.cdn_url %>
 </head>
 <body>
   <div class="outer">
@@ -16,16 +19,16 @@
 		  <%= render :partial => "sunrise/shared/panel" %>
 		  <%= manage_render_header %>
 	  </div>
-	  
+
     <%= yield %>
 	</div>
-	
+
 	<div class="footer">
 	  <div class="fwrapper">
       <%= image_tag("sunrise/created.png", :title => "fodojo.com") %>
 	  </div>
 	</div>
-  	
+
 	<div id="dark-shadow" class="dark-bg" style="display:none;"></div>
 </body>
 </html>

data/app/views/sunrise/manager/_field.html.erb

@@ -6,14 +6,14 @@
     <% elsif field.nested? -%>
       <div class="nested">
         <div class="title-switcher up"><%= form.label field.name %></div>
-        
+
         <%= form.simple_fields_for field.name.to_sym do |nested| %>
-          <%= render :partial => "nested_field", :locals => { :form => nested, :field => field }  %>
+          <%= render partial: "nested_field", locals: { form: nested, field: field }  %>
         <% end -%>
-        
+
         <% if field.multiply? %>
           <div class="nested_bottom">
-            <%= manage_add_child_link t('manage.buttons.add_nested_field'), form, field, {:partial=>"nested_field"} %>
+            <%= manage_add_child_link t('manage.buttons.add_nested_field'), form, field, { partial: "nested_field" } %>
           </div>
         <% end -%>
 
@@ -28,7 +28,7 @@
     <% elsif field.association? -%>
       <%= form.association field.name.to_sym, field.input_options.merge(options) %>
     <% else -%>
-      <%= form.input field.name, field.input_options.merge(options)  %>
+      <%= form.input field.name, field.input_options.merge(options) %>
     <% end -%>
   <% end -%>
 <% end -%>

data/app/views/sunrise/manager/_form.html.erb

@@ -1,15 +1,15 @@
-<%= manage_form_for @record, :html => { :multipart => true } do |f| -%> 
-  <%= render :partial => 'sunrise/shared/parent' %>
+<%= manage_form_for @record, html: { multipart: true, id: 'resource-manage-form' } do |f| -%>
+  <%= render partial: 'sunrise/shared/parent' %>
 
   <div class="post-edit-holder">
-    <%= render :partial => "sunrise/shared/locale" if abstract_model.translate? %>
-    
+    <%= render partial: "sunrise/shared/locale" if abstract_model.translate? %>
+
 	  <div class="wysiwyg-holder">
-	    <%= render :partial => "sunrise/shared/available_locales", :locals => {:form => f} if abstract_model.translate? %>
-      
-      <%= render :partial => 'field', :collection => abstract_model.form_fields, :locals => {:form => f} %>
+	    <%= render partial: "sunrise/shared/available_locales", locals: {form: f} if abstract_model.translate? %>
+
+      <%= render partial: 'field', collection: abstract_model.form_fields, locals: {form: f} %>
 	  </div>
-	  
+
 	  <% if abstract_model.sidebar_groups? -%>
 	    <div class="post-properties-holder">
 	      <% abstract_model.sidebar_groups.each do |group| -%>
@@ -17,17 +17,17 @@
 		        <% if group.title != false -%>
   		        <div class="title-switcher up"><span><%= group.title %></span></div>
 		        <% end -%>
-		        
-		        <%= render :partial => 'field', :collection => group.fields, :locals => {:form => f} %>
+
+		        <%= render partial: 'field', collection: group.fields, locals: {form: f} %>
 	        </div>
 	      <% end -%>
-	    </div>  
+	    </div>
 	  <% end -%>
   </div>
-  
+
   <% abstract_model.bottom_groups.each do |group| -%>
-    <%= render :partial => 'field', :collection => group.fields, :locals => {:form => f} %>
+    <%= render partial: 'field', collection: group.fields, locals: {form: f} %>
   <% end -%>
-  
-  <%= f.button :submit, :style => "display:none;", :id => "submit-button-hidden" %>
+
+  <%= f.button :submit, style: "display:none;", id: "submit-button-hidden" %>
 <% end -%>

data/app/views/sunrise/manager/_header_edit.html.erb

@@ -1,11 +1,10 @@
 <div class="filter-line-wrapper">
   <div class="filter-line-holder">
 	  <div class="struct-name"><%= t('manage.edit')%></div>
-	
+
 	  <div class="vline-block">
-	    <%= submit_tag t('manage.update'), :class => 'button', :id => 'submit-form-button'  %>
-	    <%= submit_tag t('manage.cancel'), :class => 'button gray', :id => 'cancel-submit-form-button' %>
-		  <!--<input type="submit" value="Применить" class="button gray" />-->
+	    <%= submit_tag t('manage.update'), class: 'button', id: 'submit-form-button', form: 'resource-manage-form' %>
+	    <%= submit_tag t('manage.cancel'), class: 'button gray', id: 'cancel-submit-form-button' %>
 	  </div>
   </div>
 </div>

data/app/views/sunrise/manager/_header_new.html.erb

@@ -1,10 +1,10 @@
 <div class="filter-line-wrapper">
   <div class="filter-line-holder">
 	  <div class="struct-name"><%= t('manage.add')%></div>
-	
+
 	  <div class="vline-block">
-	    <%= submit_tag t('manage.create'), :class => 'button', :id => 'submit-form-button'  %>
-	    <%= submit_tag t('manage.cancel'), :class => 'button gray', :id => 'cancel-submit-form-button' %>
+	    <%= submit_tag t('manage.create'), class: 'button', id: 'submit-form-button', form: 'resource-manage-form' %>
+	    <%= submit_tag t('manage.cancel'), class: 'button gray', id: 'cancel-submit-form-button' %>
 	  </div>
   </div>
 </div>

data/app/views/sunrise/manager/_header_show.html.erb

@@ -3,10 +3,10 @@
     <div class="struct-name"><%= abstract_model.label %></div>
 
     <div class="vline-block">
-      <%= form_for search_wrapper, :url => scoped_index_path,  :html => { :method => :get, :novalidate => true } do |f| %>
-        <%= render :partial => 'sunrise/shared/parent' %>
+      <%= form_for search_wrapper, url: scoped_index_path,  html: { method: :get, novalidate: true } do |f| %>
+        <%= render partial: 'sunrise/shared/parent' %>
         <%= f.text_field :q %>
-        <%= f.submit t('manage.search'), :class => "button" %>
+        <%= f.submit t('manage.search'), class: "button" %>
       <% end %>
     </div>
   </div>
@@ -15,28 +15,24 @@
 <div class="top-line-holder">
   <div class="act-buttons-wrapper">
 
-    <% if can? :edit, @record, :context => :sunrise %>
+    <% if can? :edit, @record, context: :sunrise %>
       <div class="but-holder">
         <div class="act-but">
-          <%= link_to image_tag('sunrise/empty.gif'), edit_path(abstract_model.parent_hash.merge(:id => @record.id)), :class => 'but-container edit', :title => 'Edit' %>
+          <%= link_to image_tag('sunrise/empty.gif'), edit_path(abstract_model.parent_hash.merge(id: @record.id)), class: 'but-container edit', title: 'Edit' %>
         </div>
       </div>
     <% end -%>
 
-    <% if can? :delete, @record, :context => :sunrise %>
+    <% if can? :delete, @record, context: :sunrise %>
       <div class="but-holder">
         <div class="act-but">
-          <%= link_to image_tag('sunrise/empty.gif'), delete_path(abstract_model.parent_hash.merge(:id => @record.id)), 
-          :class => 'but-container del', 
-          :title => 'Delete', 
-          :method=>:delete,
-          :data => { :confirm => t('manage.confirm_delete') } %>
+          <%= link_to image_tag('sunrise/empty.gif'), delete_path(abstract_model.parent_hash.merge(id: @record.id)), class: 'but-container del', title: 'Delete', method: :delete, data: { confirm: t('manage.confirm_delete') } %>
         </div>
       </div>
     <% end %>
 
     <div class="buttons-holder">
-      <%= render :partial => apply_scope("controls"), :locals => {:record => @record} %>
+      <%= render partial: apply_scope("controls"), locals: { record: @record } %>
     </div>
   </div>
-</div>
+</div>

data/app/views/sunrise/manager/_nested_field.html.erb

@@ -1,10 +1,10 @@
 <div class="nested_item">
-  <%= manage_remove_child_link('', form, :class => "close-but") if field.multiply? %>
-  
+  <%= manage_remove_child_link('', form, class: "close-but") if field.multiply? %>
+
   <% if field.sort? %>
-    <%= image_tag 'sunrise/tree_dnd1.png', :class => "nested_input_handle" %>
-    <%= form.hidden_field field.sort_column, :class => "nested_input_sort" if field.sort_hidden_field? %>
+    <%= image_tag 'sunrise/tree_dnd1.png', class: "nested_input_handle" %>
+    <%= form.hidden_field field.sort_column, class: "nested_input_sort" if field.sort_hidden_field? %>
   <% end -%>
 
-  <%= render :partial => 'field', :collection => field.fields, :locals => {:form => form} %>
-</div>
+  <%= render partial: 'field', collection: field.fields, locals: { form: form } %>
+</div>

data/app/views/sunrise/manager/buttons/_export.html.erb

@@ -1,5 +1,12 @@
 <div class="but-holder">
   <div class="act-but">
-    <%= link_to image_tag('sunrise/empty.gif'), export_path(:format => :csv), :class => 'but-container opt', :title => 'Export' %>
+    <%= link_to 'CSV', export_path(format: :csv), class: 'but-container export', title: 'Export' %>
   </div>
-</div>
+</div>
+<% if defined?(Mime::XLSX) %>
+  <div class="but-holder">
+    <div class="act-but">
+      <%= link_to 'XLS', export_path(format: :xlsx), class: 'but-container export', title: 'Export (XLS)' %>
+    </div>
+  </div>
+<% end %>

data/app/views/sunrise/manager/buttons/_import.html.erb

@@ -0,0 +1,25 @@
+<% if abstract_model.config.available_import %>
+  <div class="but-holder">
+    <div class="act-but">
+      <%=
+        link_to(
+          image_tag('sunrise/empty.gif'),
+          export_path(format: :csv),
+          class: 'but-container import',
+          id: 'import-button',
+          title: 'Import',
+          data: {
+            title: 'Import',
+            url: import_path
+          }
+        )
+      %>
+
+      <script type="text/javascript">
+        $(document).ready(function(){
+          $('#import-button').import_dialog();
+        });
+      </script>
+    </div>
+  </div>
+<% end %>

data/app/views/sunrise/manager/buttons/_sort.html.erb

@@ -1,13 +1,13 @@
 <div class="but-holder">
   <div class="act-but">
     <%= link_to image_tag('sunrise/empty.gif'), export_path(:format => :json), :class => 'but-container sort', :title => t('manage.buttons.sort'), :id => 'sort-button', :"data-save_title" => t('manage.buttons.save'), :"data-cancel_title" => t('manage.buttons.cancel'), :"data-url" => sort_path(:format => :json) %>
-    
+
     <script type="text/javascript">
       $(document).ready(function(){
         $('#sort-button').sort_dialog();
       });
     </script>
-    
+
     <script id="sort-template" type="text/x-jquery-tmpl">
       <div class="sort-item" data-record-id="${id}">
         <div class="sort-inner">
@@ -17,4 +17,4 @@
       </div>
     </script>
   </div>
-</div>
+</div>

data/app/views/sunrise/manager/edit.html.erb

@@ -1,3 +1,3 @@
 <div class="wrapper without-panel">
-  <%= render :partial => 'form' %>
+  <%= render partial: 'form' %>
 </div>

data/app/views/sunrise/manager/new.html.erb

@@ -1,3 +1,3 @@
 <div class="wrapper without-panel">
-  <%= render :partial => 'form' %>
+  <%= render partial: 'form' %>
 </div>

data/app/views/sunrise/manager/structures/thumbs/_record.html.erb

@@ -1,15 +1,14 @@
-<%= content_tag(:div, :id => dom_id(record), :class => "main-item") do %>
+<%= content_tag(:div, id: dom_id(record), class: "main-item") do %>
   <div class="check-block"><input type="checkbox" /></div>
   <div class="img-block"> <%= image_tag 'sunrise/default_ava.png' %> </div>
   <div class="data-block">
     <div class="top-info-bl">
       <%= manage_date_tag(record.created_at)%>
-      <!--<a href="#" class="grey-but">Активировать</a>-->
     </div>
-    <%= link_to record.send(abstract_model.config.object_label_method), manage_structure_path(record), :class=>"item-title" %>
-    
+    <%= link_to record.send(abstract_model.config.object_label_method), manage_structure_path(record), class: "item-title" %>
+
 		<div class="bot-info-bl">
-		  
+
 		  <% abstract_model.list.fields.each do |field|%>
 			<div class="info-item">
 				<b><%= field.human_name %></b> <%= manage_render_field(field, record)%>
@@ -18,15 +17,19 @@
 
 		</div>
   </div>
-  <div class="but-block" style="display: none">
-    <div class="act-but">
-      <%= link_to image_tag('sunrise/empty.gif'), delete_path(abstract_model.parent_hash.merge(:id => record.id)), 
-          :method=>:delete, :data => {:confirm=>t("manage.confirm_delete")}, :class=>"but-container del", 
-          :id => dom_id(record, :delete) if can?(:delete, record, :context => :sunrise) %>
-    </div>
-    
-    <div class="act-but">
-      <%= link_to image_tag('sunrise/empty.gif'), edit_path(abstract_model.parent_hash.merge(:id => record.id)), :class=>"but-container edit", :id => dom_id(record, :edit) if can?(:edit, record, :context => :sunrise) %>
-    </div>
+  <div class="but-block">
+    <% if can?(:delete, record, context: :sunrise) %>
+      <div class="act-but">
+        <%= link_to image_tag('sunrise/empty.gif'), delete_path(abstract_model.parent_hash.merge(id: record.id)),
+            method: :delete, data: {confirm: t("manage.confirm_delete")}, class: "but-container del",
+            id: dom_id(record, :delete) %>
+      </div>
+    <% end %>
+
+    <% if can?(:edit, record, context: :sunrise) %>
+      <div class="act-but">
+        <%= link_to image_tag('sunrise/empty.gif'), edit_path(abstract_model.parent_hash.merge(id: record.id)), class: "but-container edit", id: dom_id(record, :edit) %>
+      </div>
+    <% end %>
   </div>
-<% end -%>  
+<% end -%>

data/app/views/sunrise/manager/thumbs/_record.html.erb

@@ -1,18 +1,18 @@
-<%= content_tag(:div, :id => dom_id(record), :class => "main-item") do -%>
+<%= content_tag(:div, id: dom_id(record), class: "main-item") do -%>
   <div class="check-block">
-    <%= check_box_tag dom_id(record, :editable), record.id, false, :name => :editable %>
+    <%= check_box_tag dom_id(record, :editable), record.id, false, name: :editable %>
   </div>
-  <% if abstract_model.list.preview -%>  
+  <% if abstract_model.list.preview -%>
     <div class="img-block"><%= image_tag abstract_model.list.preview_for(record) %></div>
   <% end -%>
   <div class="data-block">
     <div class="top-info-bl">
       <%= manage_date_tag(record.created_at)%>
-      <%= render :partial => apply_scope("controls"), :locals => {:record => record} %>
+      <%= render partial: apply_scope("controls"), locals: {record: record} %>
     </div>
-    <%= link_to record.send(abstract_model.config.object_label_method), show_model_path(abstract_model, record), :class=>"item-title" %>
-    
-		<div class="bot-info-bl">  
+    <%= link_to record.send(abstract_model.config.object_label_method), show_model_path(abstract_model, record), clas:"item-title" %>
+
+		<div class="bot-info-bl">
 		  <% abstract_model.list.fields.each do |field| -%>
 			  <div class="info-item">
 			    <%= content_tag(:b, field.human_name) if field.label? %>
@@ -21,19 +21,23 @@
 			<% end -%>
 		</div>
   </div>
-  <div class="but-block" style="display: none">
-    <div class="act-but">
-      <%= link_to image_tag('sunrise/empty.gif'), delete_path(abstract_model.parent_hash.merge(:id => record.id)),
-          :method=>:delete, 
-          :data => {:confirm => t("manage.confirm_delete") }, 
-          :class=>"but-container del", 
-          :id => dom_id(record, :delete) if can?(:delete, record, :context => :sunrise) %>
-    </div>
-    
-    <div class="act-but">
-      <%= link_to image_tag('sunrise/empty.gif'), edit_path(abstract_model.parent_hash.merge(:id => record.id)), 
-          :class=>"but-container edit", 
-          :id => dom_id(record, :edit) if can?(:edit, record, :context => :sunrise) %>
-    </div>
+  <div class="but-block">
+    <% if can?(:delete, record, context: :sunrise) %>
+      <div class="act-but">
+        <%= link_to image_tag('sunrise/empty.gif'), delete_path(abstract_model.parent_hash.merge(id: record.id)),
+            method: :delete,
+            data: {confirm: t("manage.confirm_delete") },
+            clas:"but-container del",
+            id: dom_id(record, :delete) %>
+      </div>
+    <% end %>
+
+    <% if can?(:edit, record, context: :sunrise) %>
+      <div class="act-but">
+        <%= link_to image_tag('sunrise/empty.gif'), edit_path(abstract_model.parent_hash.merge(id: record.id)),
+            clas:"but-container edit",
+            id: dom_id(record, :edit) %>
+      </div>
+    <% end %>
   </div>
-<% end -%>  
+<% end -%>

data/app/views/sunrise/manager/tree/index.html.erb

@@ -9,7 +9,7 @@
 <script type='text/javascript'>
   $(document).ready(function(){
     window['sunrise'].storeQuery();
-    
+
     $("#sortable ul").sortable({
       placeholder: "tree-state-shadow",
 			handle: "a.dnd_link",

data/app/views/sunrise/settings/_form.html.erb

@@ -1,13 +1,13 @@
-<%= simple_form_for Settings, :url => settings_path, :html => {:method => :put} do |f| -%>
+<%= simple_form_for Settings.new, url: settings_path, html: {method: :put, id: 'resource-manage-form'} do |f| -%>
   <div class="post-edit-holder">
     <div class="wysiwyg-holder">
-      <% @settings.each do |key, value| -%>
+      <% @fields.each do |field| -%>
         <div class="padder">
-          <%= f.input key, :value => value, :required => false %>
+          <%= f.input field[:key], value: Settings[field[:key]], placeholder: field[:default], readonly: field[:readonly], as: field[:type] %>
         </div>
       <% end -%>
     </div>
   </div>
-  
-  <%= f.button :submit, :style => "display:none;", :id => "submit-button-hidden" %>
+
+  <%= f.button :submit, style: "display:none;", id: "submit-button-hidden" %>
 <% end -%>

data/app/views/sunrise/settings/_header_edit.html.erb

@@ -1,11 +1,10 @@
 <div class="filter-line-wrapper">
   <div class="filter-line-holder">
 	  <div class="struct-name"><%= t('manage.edit')%></div>
-	
+
 	  <div class="vline-block">
-	    <%= submit_tag t('manage.update'), :class => 'button', :id => 'submit-form-button'  %>
-	    <%= submit_tag t('manage.cancel'), :class => 'button gray', :id => 'cancel-submit-form-button' %>
-		  <!--<input type="submit" value="Применить" class="button gray" />-->
+	    <%= submit_tag t('manage.update'), class: 'button', id: 'submit-form-button', form: 'resource-manage-form' %>
+	    <%= submit_tag t('manage.cancel'), class: 'button gray', id: 'cancel-submit-form-button' %>
 	  </div>
   </div>
 </div>