my_forum 0.0.1.beta26 → 0.0.1.beta27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 020ff8affd1ce1d65168d750aaa61b9ae3d57428
-  data.tar.gz: 0ed70a668baca8ce0c11f49131f52d53bfa8104e
+  metadata.gz: 85befe5d26e8e5dd2cdd6c60b72b8603447b9c5d
+  data.tar.gz: 0edfd26fa58e9b16ec5cbf13210352d732adb120
 SHA512:
-  metadata.gz: d019565ba88c7ce909f34b25bd78d2a10f10fb81ea2effb8669d1048494a3f7277439c2662ebb9654724d54ea7fdf1039bc34949d5f67bf9329eac4ba3663095
-  data.tar.gz: 07bd3b757f4fa2624a74ba343a02cbd30150ab0c5d21fb831685ddadbf850472f94e34015ac0fda42606d99246592d9c3eb72e9711d61516e7b9e4b2bbd305fb
+  metadata.gz: 55a8479d2f36b42a31b41f686c69a9dd17fdb5ce98e65480c156f88a6d7085770f612b8b8077dfe04c1dafb8b97c6d9af425b328ea6ce1bb1fd77d0cc75e0a28
+  data.tar.gz: a9583685f8dc25443eddd20846f9e35aed13a0323ce27c0ccdba6d06c4410c5e82783631e490a98d1057bbf555304a6d4dbbe0fbb2d93a6d691db657b41ce441

data/app/controllers/my_forum/attachments_controller.rb

@@ -12,6 +12,8 @@ module MyForum
       attachment_ids = []
 
       params[:files].each do |uploaded_io|
+        next unless Attachment::ALLOWED_FILE_EXTENSIONS.include? File.extname(uploaded_io.original_filename)
+
         file_name = "#{Time.now.to_i}_#{uploaded_io.original_filename}"
         File.open(File.join(upload_path, file_name), 'wb') do |file|
           file.write(uploaded_io.read)

data/app/helpers/my_forum/application_helper.rb

@@ -40,5 +40,8 @@ module MyForum
       forum_time(datetime)
     end
 
+    def upload_allowed_extensions
+      Attachment::ALLOWED_FILE_EXTENSIONS
+    end
   end
 end

data/app/models/my_forum/attachment.rb

@@ -5,5 +5,7 @@ module MyForum
 
     UPLOAD_PATH = File.join(Rails.public_path, 'uploads', 'attachments')
     URL  = File.join('/uploads', 'attachments')
+
+    ALLOWED_FILE_EXTENSIONS = %w(.jpg .png .gif)
   end
 end

data/app/views/my_forum/topics/_quick_answer.haml

@@ -56,6 +56,7 @@
         %h4.modal-title
           = t('.add_new_photo')
       .modal-body
+        %p= t('my_forum.attachments.allowed_extensions', ext: upload_allowed_extensions.join(', '))
         = form_for MyForum::Attachment.new, url: attachments_path, multipart: true, remote: true do |f|
           = f.file_field 'file[]', multiple: true, id: 'attachment_files'
 
@@ -83,6 +84,7 @@
                 $('#quick_answer_textarea').append(bbcode_attachments)
                 $('#loaded-content').html('#{t('my_forum.successfull_aploaded')}')
                 $('#add_photo').modal('hide')
+                $('#attachment_files').val('')
             })
 
 

data/config/locales/ru.yml

@@ -9,6 +9,10 @@ ru:
     create_new_topic: 'Создать новую тему'
     reply_for_pm: 'Ответить на сообщение'
     successfull_aploaded: 'Файлы успешно загружены'
+
+    attachments:
+      allowed_extensions: "Разрешенные расширения файлов: %{ext}"
+
     bbquote:
       wrote: 'написал'
 

data/lib/my_forum/version.rb

@@ -1,3 +1,3 @@
 module MyForum
-  VERSION = "0.0.1.beta26"
+  VERSION = "0.0.1.beta27"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: my_forum
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta26
+  version: 0.0.1.beta27
 platform: ruby
 authors:
 - Vitaly Omelchenko