Skip to content

Commit b770e12

Browse files
author
Gogs
committed
Search for parent folder when creating new folders
1 parent fb7c034 commit b770e12

2 files changed

Lines changed: 14 additions & 10 deletions

File tree

app/controllers/documents_controller.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,6 @@ def destroy
8888

8989
private
9090

91-
def document_params
92-
params.permit(:title, :description, :document_date, :folder, :person, :state, :document)
93-
end
94-
9591
def set_document
9692
@document = Document.find(params[:id])
9793
end

app/controllers/folders_controller.rb

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,13 @@ def all
1515

1616
# POST /folders
1717
def create
18-
@folder = current_user.folders.create!(folder_params)
18+
@parent_folder = params[:folder].blank? ? nil : Folder.find(params[:folder])
19+
@params = {
20+
"name" => params[:name],
21+
"folder" => @parent_folder
22+
}
23+
24+
@folder = current_user.folders.create!(@params)
1925
json_response(@folder, :created)
2026
end
2127

@@ -26,7 +32,13 @@ def show
2632

2733
# PUT /folders/:id
2834
def update
29-
@folder.update(folder_params)
35+
@parent_folder = params[:folder].blank? ? nil : Folder.find(params[:folder])
36+
@params = {
37+
"name" => params[:name],
38+
"folder" => @parent_folder
39+
}
40+
41+
@folder.update(@params)
3042
head :no_content
3143
end
3244

@@ -38,10 +50,6 @@ def destroy
3850

3951
private
4052

41-
def folder_params
42-
params.permit(:name, :folder, :user)
43-
end
44-
4553
def set_folder
4654
@folder = Folder.find(params[:id])
4755
end

0 commit comments

Comments
 (0)