rademade_admin 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac099ed3499fd7a5621251f91ca93e4b8a3e955b
-  data.tar.gz: 2825da23890de8701d5a6c0e5a911a5014ad49dd
+  metadata.gz: e967c4945eda7534ef2e9ed32ae11b9686e16dc5
+  data.tar.gz: 68134738ae0f819c71c11abde50944e0b70d1da9
 SHA512:
-  metadata.gz: 35fa13e49f08390a27fc4a406eb04d1ec90ba6863d86f817344aaacc7e9945a832a85bb18a57e566402ead9fa371e27d16e639c349ee716a1e526f9129f3dd17
-  data.tar.gz: 564df47bbc1bedc5a3cb7ba02f9dbce4303f85a8a09ea0e515a102f4de14da00c11d16e90345a5e21af999cc1c0eca5c0cc6ed195716f0d844d55701c8469afa
+  metadata.gz: 93b797e63ff62a8c46185834188b9108e88e5c8a0a2317e114c021a83535c9b9fa61d012846b0386e5f7cd1e0b869dc8330117aad65a76e1c012d818eb35587c
+  data.tar.gz: c745f46bed20435c396c68d6be3dd3c09d4c4c5493ee4eb603cec0686f1f52efaf8a6da8b7d2feedab2d90329f70e0991b9947e6a36b88abfdaacb7849838f11

data/app/assets/javascripts/rademade_admin.coffee

@@ -36,6 +36,7 @@
 #= require underscore/underscore
 #= require backbone/backbone
 #= require_tree ./rademade_admin/library
+#= require_tree ./rademade_admin/settings
 #= require_tree ./rademade_admin/form
 #= require_tree ./rademade_admin/app
 #= require_tree ./rademade_admin

data/app/assets/javascripts/rademade_admin/app/common/location.coffee.erb

@@ -44,7 +44,10 @@ class @Location extends Backbone.View
 
   @initAll : () ->
     $('.location').each () ->
-      Location.init $(this)
+      $location = $(this)
+      unless $location.data('initialized')
+        Location.init $location
+        $location.data('initialized', true)
 
 $ ->
   $(document).on('page:load ready init-plugins', Location.initAll)

data/app/assets/javascripts/rademade_admin/app/common/uploader.coffee

@@ -65,6 +65,7 @@ class @Uploader extends Backbone.View
   _getUploaderData : () ->
     uploaderData = _.pick(@$uploader.data(), 'id', 'saved', 'model', 'column', 'uploader')
     uploaderData.path = @$el.find('.form-input[type="hidden"]').val()
+    uploaderData.authenticity_token = encodeURI($('meta[name="csrf-token"]').attr('content'))
     uploaderData
 
   _setUploadProgress : (progress) =>

data/app/assets/javascripts/rademade_admin/app/form-popup/view.coffee

@@ -26,11 +26,10 @@ class @FormPopup.View extends Backbone.View
     @$el.remove()
 
   renderFromUrl : (url) ->
-    $.get url, (html) =>
-      @$el.html html
-      @_updatePosition()
+    @$el.load url, =>
       @delegateEvents()
       @_init()
+      @show();
 
   render : () ->
     @renderFromUrl @model.get('edit_url')
@@ -61,4 +60,4 @@ class @FormPopup.View extends Backbone.View
     popupView = new FormPopup.View
       model : model
     popupView.render()
-    popupView
+    popupView

data/app/assets/javascripts/rademade_admin/settings/ajax-csrf.coffee

@@ -0,0 +1,4 @@
+$ ->
+    $.ajaxSetup( headers: {
+      'X-CSRF-Token': $('meta[name="csrf-token"]').attr('content')
+    })

data/app/assets/stylesheets/rademade_admin/lib/uploader.sass

@@ -51,16 +51,17 @@
         margin: 10px 10px 0 0
 
     .upload-progress-wrapper
+        position: relative
+        top: -5px
         display: none
         float: right
-        margin-top: 18px
-        width: 130px
-        height: 10px
-        border: 1px solid #bdc3c7
-        +border-radius(11px)
+        width: 100%
+        height: 5px
+        overflow: hidden
+        +border-radius(5px)
 
         .upload-progress
             height: 100%
             width: 0
             background: #00c83e
-            +border-radius(11px)
+            +border-radius(5px)

data/app/cells/menu/sub_item.slim

@@ -1,4 +1,4 @@
 li class=('menu-box' + (@is_active ? ' active' : ''))
   a.menu-link(href="#{@uri}") #{@name}
   - if @has_sub_items
-    =render(:menu, :sub_items, @sub_items)
+    =render_cell(:menu, :sub_items, @sub_items)

data/app/controllers/rademade_admin/abstract_controller.rb

@@ -8,6 +8,8 @@ module RademadeAdmin
     layout 'rademade_admin'
 
     before_action :init_user, :init_template_service, :require_login, :root_breadcrumbs
+    
+    attr_reader :current_user
 
     rescue_from ::CanCan::AccessDenied do |exception|
       redirect_to root_url, :alert => exception.message

data/app/controllers/rademade_admin/model_controller.rb

@@ -7,6 +7,10 @@ module RademadeAdmin
     include RademadeAdmin::InstanceOptions
     include RademadeAdmin::Templates
     include RademadeAdmin::Notifier
+    
+    helper ::RademadeAdmin::FieldHelper
+    helper ::RademadeAdmin::FormHelper
+    helper ::RademadeAdmin::UriHelper
 
     before_filter :load_options, :additional_options
     before_filter :sortable_service, :only => [:index]
@@ -15,25 +19,20 @@ module RademadeAdmin
       authorize! :create, model_class
       saver = RademadeAdmin::Saver.new(model_info, params)
       saver.create_model
-      if saver.save_model
-        saver.save_aggregated_data #rm_todo glue methods
-        @item = saver.item
-        success_insert @item
-      else
-        render_errors saver.errors
-      end
+      saver.save_data
+      success_insert( saver.item )
+    rescue Exception => e
+      render_errors e.record.errors
     end
 
     def update
       authorize! :update, model_class
       saver = RademadeAdmin::Saver.new(model_info, params)
-      if saver.update_model
-        saver.save_aggregated_data #rm_todo glue methods
-        @item = saver.item
-        success_update @item
-      else
-        render_errors saver.errors
-      end
+      saver.find_model
+      saver.save_data
+      success_update( saver.item )
+    rescue Exception => e
+      render_errors e.record.errors
     end
 
     def destroy
@@ -97,11 +96,12 @@ module RademadeAdmin
       relation_service = RademadeAdmin::RelationService.new
       @related_model_info = relation_service.related_model_info(model_info, params[:relation])
 
-      @item = model.find(params.delete(:id))
-      conditions = Search::Conditions::RelatedList.new(@item, params, @related_model_info.data_items)
+      @item = model.find(params[:id])
+      search_params = params.except(:id)
+      conditions = Search::Conditions::RelatedList.new(@item, search_params, @related_model_info.data_items)
       @items = Search::Searcher.new(@related_model_info).search(conditions)
 
-      @sortable_service = RademadeAdmin::SortableService.new(@related_model_info, params)
+      @sortable_service = RademadeAdmin::SortableService.new(@related_model_info, search_params)
 
       respond_to do |format|
         format.html {
@@ -163,6 +163,5 @@ module RademadeAdmin
     def additional_options
       MenuCell.current_model = model
     end
-
   end
 end

data/app/helpers/rademade_admin/uri_helper.rb

@@ -87,7 +87,11 @@ module RademadeAdmin::UriHelper
     begin
       Rails.application.routes.url_helpers.url_for(opts)
     rescue
-      RademadeAdmin::Engine.routes.url_helpers.url_for(opts)
+      begin
+        RademadeAdmin::Engine.routes.url_helpers.url_for(opts)
+      rescue
+        nil
+      end
     end
   end
 

data/app/inputs/rademade_admin/date_time_input.rb

@@ -2,7 +2,7 @@
 module RademadeAdmin
   class DateTimeInput < SimpleForm::Inputs::DateTimeInput
 
-    def input
+    def input(wrapper_options = {})
       @builder.text_field(attribute_name, input_html_options.merge({
         :data => { 'date-time-picker' => '' },
         :value => object.send(attribute_name).try(:strftime, '%d.%m.%Y %R')

data/app/inputs/rademade_admin/file_input.rb

@@ -4,7 +4,7 @@ module RademadeAdmin
 
     include UriHelper
 
-    def input
+    def input(wrapper_options = {})
       template.content_tag(
         :div,
         HtmlBuffer.new([file_html]),

data/app/inputs/rademade_admin/location_input.rb

@@ -2,7 +2,7 @@
 module RademadeAdmin
   class LocationInput < SimpleForm::Inputs::Base
 
-    def input
+    def input(wrapper_options = {})
       template.content_tag(
         :div,
         HtmlBuffer.new([map_html, location_attributes_html]),

data/app/inputs/rademade_admin/related_select_input.rb

@@ -9,7 +9,7 @@ module RademadeAdmin
     include ::RademadeAdmin::Input::RelatedSelectInput::ModelData
     include ::RademadeAdmin::Input::RelatedSelectInput::RelatedList
 
-    def input
+    def input(wrapper_options = {})
       template.content_tag(
         :div,
         RademadeAdmin::HtmlBuffer.new([select_ui_html, add_button_html]),

data/app/services/saver.rb

@@ -17,27 +17,18 @@ module RademadeAdmin
       @item = @model_info.model.new
     end
 
-    def update_model
+    def find_model
       @item = @model_info.model.find(@params[:id])
-      save_model
     end
 
-    def save_model
+    def save_data
       item.assign_attributes simple_field_params
       save_localizable_fields
-      item.save
-    end
-
-    def save_aggregated_data
       save_model_relations
       save_model_uploads
       item.save!
     end
 
-    def errors
-      item.errors
-    end
-
     private
 
     def save_localizable_fields

data/lib/rademade_admin/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module RademadeAdmin
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rademade_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Vladislav Melanitskiy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -154,16 +154,16 @@ dependencies:
   name: i18n-js
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ejs
   requirement: !ruby/object:Gem::Requirement
@@ -387,6 +387,7 @@ files:
 - app/assets/javascripts/rademade_admin/library/ckeditor/config.js
 - app/assets/javascripts/rademade_admin/library/jquery/jquery.tablednd.js
 - app/assets/javascripts/rademade_admin/library/notifier.custom.min.js
+- app/assets/javascripts/rademade_admin/settings/ajax-csrf.coffee
 - app/assets/stylesheets/edit.css
 - app/assets/stylesheets/rademade_admin.sass.erb
 - app/assets/stylesheets/rademade_admin/base/main.sass