Add folders to the documents plugin

app/assets/stylesheets/bootstrap_and_overrides.css.less

@@ -180,6 +180,11 @@ table {
   color: #B94A48;
 }
 
+// Documents
+.documents-item-folder {
+  font-weight: bold;
+}
+
 // Wiki
 #wikiContent {
   .editsection {

config/locales/de.yml

@@ -39,7 +39,7 @@ de:
         supplier: Lieferantin
       document:
         created_at: Erstellt am
-        created_by_user_id: Erstellt von
+        created_by: Erstellt von
         data: Daten
         mime: MIME-Typ
         name: Name
@@ -738,15 +738,20 @@ de:
       logged_in: Angemeldet!
   documents:
     create:
-      error: 'Dokument konnte nicht erstellt werden: %{error}'
+      error: 'Dokument oder Ordner konnte nicht erstellt werden: %{error}'
       not_allowed_mime: Der Dateityp "%{mime}" ist nicht erlaubt. Bitte kontaktiere einen Administrator um ihn freizuschalten.
-      notice: Dokument wurde erstellt
+      notice: Dokument oder Ordner wurde erstellt
     destroy:
-      error: 'Dokument konnt nicht gelöscht werden: %{error}'
+      error: 'Dokument oder Ordner konnt nicht gelöscht werden: %{error}'
-      no_right: Du hast nicht genügend Rechte um die Datei zu löschen
+      no_right: Du hast nicht genügend Rechte um die Datei oder den Ordner zu löschen
-      notice: Dokument wurde gelöscht
+      notice: Dokument oder Ordner wurde gelöscht
+    form:
+      new: Neues Dokument
+      new_folder: Neuer Ordner
+      submit: Erstellen
     index:
       new: Neues Dokument anlegen
+      new_folder: Neuen Ordner anlegen
       title: Dokumente
     multiple_orders_by_articles:
       filename: Artikelsortierung aktueller Bestellungen
@@ -754,8 +759,6 @@ de:
     multiple_orders_by_groups:
       filename: Gruppensortierung aktueller Bestellungen
       title: Aktuelle Bestellungen - Gruppensortierung
-    new:
-      title: Neues Dokument
     order_by_articles:
       filename: Bestellung %{name}-%{date} - Artikelsortierung
       rows:

config/locales/en.yml

@@ -39,7 +39,7 @@ en:
         supplier: Supplier
       document:
         created_at: Created at
-        created_by_user_id: Created by
+        created_by: Created by
         data: Data
         mime: MIME type
         name: Name
@@ -740,15 +740,20 @@ en:
       logged_in: Logged in!
   documents:
     create:
-      error: 'Document could not be created: %{error}'
+      error: 'Document or folder could not be created: %{error}'
       not_allowed_mime: The filetype "%{mime}" is not allowed. Please contact an administrator to whitelist it.
-      notice: Document was created
+      notice: Document or folder was created
     destroy:
-      error: 'Document could not be deleted: %{error}'
+      error: 'Document or folder could not be deleted: %{error}'
-      no_right: You do not have enough rights to delete the document
+      no_right: You do not have enough rights to delete the document or folder
-      notice: Document was deleted
+      notice: Document or folder was deleted
+    form:
+      new: New Document
+      new_folder: new Folder
+      submit: Create
     index:
       new: Upload new document
+      new_folder: Create new folder
       title: Documents
     multiple_orders_by_articles:
       filename: Current orders sorted by article
@@ -756,8 +761,6 @@ en:
     multiple_orders_by_groups:
       filename: Current orders sorted by group
       title: Current orders - by group
-    new:
-      title: New Document
     order_by_articles:
       filename: Order %{name}-%{date} - by articles
       rows:

config/locales/es.yml

@@ -39,7 +39,7 @@ es:
         supplier: Proveedor
       document:
         created_at: Creado en
-        created_by_user_id: Creado por
+        created_by: Creado por
         data: Datos
         mime: Tipo MIME
         name: Nombre
@@ -749,6 +749,8 @@ es:
       error: 'El documento no puede ser borrado: %{error}'
       no_right: No puedes borrar este documento
       notice: Se ha borrado el documento
+    form:
+      new: Nuevo Documento
     index:
       new: Sube nuevo documento
       title: Documentos
@@ -758,8 +760,6 @@ es:
     multiple_orders_by_groups:
       filename: Pedidos activos ordenados por grupo
       title: Pedidos activos - por grupo
-    new:
-      title: Nuevo Documento
     order_by_articles:
       filename: Pedido %{name}-%{date} - por artículos
       rows:

config/locales/fr.yml

@@ -39,7 +39,7 @@ fr:
         supplier: Fournisseur-e
       document:
         created_at: Créé le
-        created_by_user_id: Crée par
+        created_by: Crée par
         data: 
         mime: 
         name: Nom

config/locales/nl.yml

@@ -39,7 +39,7 @@ nl:
         supplier: Leverancier
       document:
         created_at: Upload op
-        created_by_user_id: Upload door
+        created_by: Upload door
         data: Data
         mime: MIME-type
         name: Naam
@@ -745,6 +745,8 @@ nl:
       error: 'Document kon niet verwijderd worden: %{error}'
       no_right: Je hebt niet genoeg rechten om het document te verwijderen
       notice: Document is verwijderd
+    form:
+      title: Nieuw document
     index:
       new: Nieuw document uploaden
       title: Documenten
@@ -754,8 +756,6 @@ nl:
     multiple_orders_by_groups:
       filename: Huidige bestellingen per huishouden
       title: Huidige bestellingen - per huishouden
-    new:
-      title: Nieuw document
     order_by_articles:
       filename: Bestelling %{name}-%{date} - Artikellijst
       rows:

db/migrate/20171105000000_add_parent_to_document.foodsoft_documents_engine.rb

@@ -0,0 +1,5 @@
+class AddParentToDocument < ActiveRecord::Migration
+  def change
+    add_reference :documents, :parent, index: true
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20171002000000) do
+ActiveRecord::Schema.define(version: 20171110000000) do
 
   create_table "article_categories", force: :cascade do |t|
     t.string "name",        limit: 255, default: "", null: false
@@ -83,8 +83,11 @@ ActiveRecord::Schema.define(version: 20171002000000) do
     t.integer  "created_by_user_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "parent_id"
   end
 
+  add_index "documents", ["parent_id"], name: "index_documents_on_parent_id", using: :btree
+
   create_table "financial_link", force: :cascade do |t|
     t.text "note"
   end

plugins/documents/app/controllers/documents_controller.rb

@@ -6,39 +6,41 @@ class DocumentsController < ApplicationController
   def index
     if params["sort"]
       sort = case params["sort"]
-               when "name" then "name"
+               when "name" then "data IS NULL DESC, name"
                when "created_at" then "created_at"
-               when "name_reverse" then "name DESC"
+               when "name_reverse" then "data IS NULL, name DESC"
                when "created_at_reverse" then "created_at DESC"
              end
     else
-      sort = "name"
+      sort = "data IS NULL DESC, name"
     end
 
-    @documents = Document.page(params[:page]).per(@per_page).order(sort)
+    @documents = Document.where(parent: @document).page(params[:page]).per(@per_page).order(sort)
   end
 
   def new
-    @document = Document.new
+    @document = Document.new parent_id: params[:document_id]
+    @document.mime = '' unless params[:type] == 'folder'
   end
 
   def create
-    @document = Document.new
+    @document = Document.new name: params[:document][:name]
-    @document.data = params[:document][:data].read
+    @document.parent = Document.find_by_id(params[:document][:parent_id])
+    data = params[:document][:data]
+    if data
+      @document.data = data.read
       @document.mime = FileMagic.new(FileMagic::MAGIC_MIME).buffer(@document.data)
       raise t('.not_allowed_mime', mime: @document.mime) unless allowed_mime? @document.mime
-    if params[:document][:name] == ''
+      if @document.name.empty?
-      name = params[:document][:data].original_filename
+        name = File.basename(data.original_filename)
-      name = File.basename(name)
         @document.name = name.gsub(/[^\w\.\-]/, '_')
-    else
+      end
-      @document.name = params[:document][:name]
     end
     @document.created_by = current_user
     @document.save!
-    redirect_to documents_path, notice: t('.notice')
+    redirect_to @document.parent || documents_path, notice: t('.notice')
   rescue => error
-    redirect_to documents_path, alert: t('.error', error: error.message)
+    redirect_to @document.parent || documents_path, alert: t('.error', error: error.message)
   end
 
   def destroy
@@ -55,7 +57,12 @@ class DocumentsController < ApplicationController
 
   def show
     @document = Document.find(params[:id])
+    if @document.file?
       send_data(@document.data, filename: @document.filename, type: @document.mime)
+    else
+      index
+      render :index
+    end
   end
 
   def allowed_mime?(mime)

plugins/documents/app/models/document.rb

@@ -1,7 +1,17 @@
 class Document < ActiveRecord::Base
-  belongs_to :created_by, :class_name => 'User', :foreign_key => 'created_by_user_id'
+  include ActsAsTree
 
-  validates_presence_of :data
+  belongs_to :created_by, class_name: 'User', foreign_key: 'created_by_user_id'
+
+  acts_as_tree
+
+  def file?
+    !folder?
+  end
+
+  def folder?
+    mime.nil?
+  end
 
   def filename
     types = MIME::Types[mime]

plugins/documents/app/views/documents/_documents.html.haml

@@ -11,7 +11,7 @@
   %tbody
     - for document in @documents
       %tr
-        %td= link_to document.name, document
+        %td= link_to document.name, document, class: "documents-item-#{document.folder? ? 'folder' : 'file'}"
         %td= format_time(document.created_at)
         %td= h show_user(document.created_by)
         %td

plugins/documents/app/views/documents/_form.html.haml

@@ -0,0 +1,12 @@
+= simple_form_for @document, validate: true do |f|
+  = f.hidden_field :parent_id
+  .modal-header
+    = close_button :modal
+    %h3= @document.folder? ? t('.new_folder') : t('.new')
+  .modal-body
+    = f.input :name, as: :string, required: @document.folder?
+    - if @document.file?
+      = f.input :data, as: :file, required: true
+  .modal-footer
+    = link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}
+    = f.submit t('.submit'), class: 'btn btn-primary'

plugins/documents/app/views/documents/index.html.haml

@@ -1,7 +1,21 @@
 - title t('.title')
 
 - content_for :actionbar do
-  = link_to t('.new'), new_document_path, class: 'btn btn-primary'
+  - options = { document_id: @document || 0 }
+  = link_to t('.new_folder'), document_new_path(options.merge(type: :folder)), remote: true, class: 'btn'
+  = link_to t('.new'), document_new_path(options), remote: true, class: 'btn btn-primary'
+
+- if @document
+  %ul.breadcrumb
+    %li
+      = link_to t('.title'), documents_path
+      %span.divider /
+    - for parent_folder in @document.ancestors.reverse
+      %li
+        = link_to parent_folder.name, parent_folder
+        %span.divider /
+    %li.active
+      = @document.name
 
 #documentsTable
   = render :partial => "documents"

plugins/documents/app/views/documents/new.html.haml

@@ -1,8 +0,0 @@
-- title t('.title')
-
-= simple_form_for(@document) do |f|
-  = f.input :name, as: :string
-  = f.input :data, as: :file
-  .form-actions
-    = f.submit class: 'btn'
-    = link_to t('ui.or_cancel'), :back

plugins/documents/app/views/documents/new.js.haml

@@ -0,0 +1,2 @@
+$('#modalContainer').html('#{j(render("form"))}');
+$('#modalContainer').modal();

plugins/documents/config/locales/de.yml

@@ -3,7 +3,7 @@ de:
     attributes:
       document:
         created_at: Erstellt am
-        created_by_user_id: Erstellt von
+        created_by: Erstellt von
         data: Daten
         mime: MIME-Typ
         name: Name
@@ -18,15 +18,18 @@ de:
     documents: Dokumente
   documents:
     create:
-      error: 'Dokument konnte nicht erstellt werden: %{error}'
+      error: 'Dokument oder Ordner konnte nicht erstellt werden: %{error}'
       not_allowed_mime: Der Dateityp "%{mime}" ist nicht erlaubt. Bitte kontaktiere einen Administrator um ihn freizuschalten.
-      notice: Dokument wurde erstellt
+      notice: Dokument oder Ordner wurde erstellt
     destroy:
-      error: 'Dokument konnt nicht gelöscht werden: %{error}'
+      error: 'Dokument oder Ordner konnt nicht gelöscht werden: %{error}'
-      no_right: Du hast nicht genügend Rechte um die Datei zu löschen
+      no_right: Du hast nicht genügend Rechte um die Datei oder den Ordner zu löschen
-      notice: Dokument wurde gelöscht
+      notice: Dokument oder Ordner wurde gelöscht
+    form:
+      new: Neues Dokument
+      new_folder: Neuer Ordner
+      submit: Erstellen
     index:
       new: Neues Dokument anlegen
+      new_folder: Neuen Ordner anlegen
       title: Dokumente
-    new:
-      title: Neues Dokument

plugins/documents/config/locales/en.yml

@@ -3,7 +3,7 @@ en:
     attributes:
       document:
         created_at: Created at
-        created_by_user_id: Created by
+        created_by: Created by
         data: Data
         mime: MIME type
         name: Name
@@ -18,15 +18,18 @@ en:
     documents: Documents
   documents:
     create:
-      error: 'Document could not be created: %{error}'
+      error: 'Document or folder could not be created: %{error}'
       not_allowed_mime: The filetype "%{mime}" is not allowed. Please contact an administrator to whitelist it.
-      notice: Document was created
+      notice: Document or folder was created
     destroy:
-      error: 'Document could not be deleted: %{error}'
+      error: 'Document or folder could not be deleted: %{error}'
-      no_right: You do not have enough rights to delete the document
+      no_right: You do not have enough rights to delete the document or folder
-      notice: Document was deleted
+      notice: Document or folder was deleted
+    form:
+      new: New Document
+      new_folder: new Folder
+      submit: Create
     index:
       new: Upload new document
+      new_folder: Create new folder
       title: Documents
-    new:
-      title: New Document

plugins/documents/config/routes.rb

@@ -2,7 +2,10 @@ Rails.application.routes.draw do
 
   scope '/:foodcoop' do
 
-    resources :documents
+    resources :documents do
+      get :new
+      get :new_folder
+    end
 
   end
 

plugins/documents/db/migrate/20171105000000_add_parent_to_document.rb

@@ -0,0 +1,5 @@
+class AddParentToDocument < ActiveRecord::Migration
+  def change
+    add_reference :documents, :parent, index: true
+  end
+end