redactor3_rails 0.1.2 → 0.1.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +1 -0
- data/app/controller/redactor3_rails/files_controller.rb +4 -11
- data/app/controller/redactor3_rails/images_controller.rb +4 -12
- data/lib/generators/redactor3/templates/mongoid/carrierwave/redactor/file.rb +1 -1
- data/lib/generators/redactor3/templates/mongoid/carrierwave/redactor/picture.rb +1 -1
- data/lib/redactor3_rails/devise.rb +3 -0
- data/lib/redactor3_rails/version.rb +1 -1
- data/lib/redactor3_rails.rb +8 -0
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a999fc5071bb6552ec994262c01850bcbfbadde6dc693d6dec6dd883ea450960
|
4
|
+
data.tar.gz: 2d130fd02b520f28f799f7d15afa39a6a5c3acbf5d616ea37fe512d6b0e3ecb8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a9794457b03e65a26804bd9e5c6c4be3e70356719f0580a4b7c1800fcb6d1e24cc18bfe9e03df5188407cc4933814dd327e0b647990e8238132fdfe406181f93
|
7
|
+
data.tar.gz: f7d81de078dafe5059a62a5d87d0c6867c2f01f1064e7925f7648c7113cefafed75ec6a8a5c7901a5e3805039d7af556ea1802774122cc308739517258ffa966
|
data/.gitignore
CHANGED
@@ -1,5 +1,6 @@
|
|
1
|
-
class Redactor3Rails::FilesController <
|
2
|
-
|
1
|
+
class Redactor3Rails::FilesController < Redactor3Rails.base_controller
|
2
|
+
include ActionView::Helpers::NumberHelper
|
3
|
+
before_action :redactor3_authenticate_user!
|
3
4
|
|
4
5
|
def create
|
5
6
|
json = {}
|
@@ -26,7 +27,7 @@ class Redactor3Rails::FilesController < ApplicationController
|
|
26
27
|
end
|
27
28
|
|
28
29
|
def index
|
29
|
-
json = Redactor3Rails.file_model.order('id DESC').map do |file|
|
30
|
+
json = Redactor3Rails.file_model.where(user_id: redactor3_current_user.id).order('id DESC').map do |file|
|
30
31
|
{
|
31
32
|
title: file.custom_file_name,
|
32
33
|
size: number_to_human_size(file.data_file_size),
|
@@ -36,12 +37,4 @@ class Redactor3Rails::FilesController < ApplicationController
|
|
36
37
|
end
|
37
38
|
render json: json
|
38
39
|
end
|
39
|
-
|
40
|
-
private
|
41
|
-
|
42
|
-
def redactor3_authenticate_user!
|
43
|
-
if Redactor3Rails.file_model.new.has_attribute?(Redactor3Rails.devise_user)
|
44
|
-
super
|
45
|
-
end
|
46
|
-
end
|
47
40
|
end
|
@@ -1,5 +1,6 @@
|
|
1
|
-
class Redactor3Rails::ImagesController <
|
2
|
-
|
1
|
+
class Redactor3Rails::ImagesController < Redactor3Rails.base_controller
|
2
|
+
skip_before_action :verify_authenticity_token
|
3
|
+
before_action :redactor3_authenticate_user!
|
3
4
|
|
4
5
|
def create
|
5
6
|
json = {}
|
@@ -11,7 +12,6 @@ class Redactor3Rails::ImagesController < ApplicationController
|
|
11
12
|
@image.send("#{Redactor3Rails.devise_user}=", redactor3_current_user)
|
12
13
|
@image.assetable = redactor3_current_user
|
13
14
|
end
|
14
|
-
|
15
15
|
if @image.save
|
16
16
|
json["file-#{i}"] = { id: @image.id, url: @image.url(:content) }
|
17
17
|
else
|
@@ -25,7 +25,7 @@ class Redactor3Rails::ImagesController < ApplicationController
|
|
25
25
|
end
|
26
26
|
|
27
27
|
def index
|
28
|
-
json = Redactor3Rails.image_model.order('id DESC').map do |image|
|
28
|
+
json = Redactor3Rails.image_model.where(user_id: redactor3_current_user.id).order('id DESC').map do |image|
|
29
29
|
{
|
30
30
|
thumb: image.data.thumb.url,
|
31
31
|
url: image.url(:content),
|
@@ -34,12 +34,4 @@ class Redactor3Rails::ImagesController < ApplicationController
|
|
34
34
|
end
|
35
35
|
render json: json
|
36
36
|
end
|
37
|
-
|
38
|
-
private
|
39
|
-
|
40
|
-
def redactor3_authenticate_user!
|
41
|
-
if Redactor3Rails.image_model.new.has_attribute?(Redactor3Rails.devise_user)
|
42
|
-
super
|
43
|
-
end
|
44
|
-
end
|
45
37
|
end
|
data/lib/redactor3_rails.rb
CHANGED
@@ -22,6 +22,14 @@ module Redactor3Rails
|
|
22
22
|
@@files_file_types = ['pdf', 'doc', 'docx', 'xls', 'xlsx', 'rtf', 'txt']
|
23
23
|
|
24
24
|
class << self
|
25
|
+
def base_controller=(v)
|
26
|
+
@base_controller = v
|
27
|
+
end
|
28
|
+
|
29
|
+
def base_controller
|
30
|
+
@base_controller ||= ApplicationController
|
31
|
+
end
|
32
|
+
|
25
33
|
def image_model=(v)
|
26
34
|
@image_model = v
|
27
35
|
end
|