Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pull] develop from decidim:develop #164

Merged
merged 2 commits into from
Aug 1, 2023
Merged

[pull] develop from decidim:develop #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
504733d
Update npm packages (#11414)
alecslupu Jul 31, 2023
3abf45a
Removal of unused show pages in admin components (#11193)
greenwoodt Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions decidim-accountability/lib/decidim/accountability/admin_engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ class AdminEngine < ::Rails::Engine
resources :results, except: [:show] do
get :proposals_picker, on: :collection

resources :attachment_collections
resources :attachments
resources :attachment_collections, except: [:show]
resources :attachments, except: [:show]
resources :timeline_entries, except: [:show]
end
resources :projects_import, only: [:new, :create]
Expand Down
5 changes: 0 additions & 5 deletions decidim-admin/app/controllers/decidim/admin/categories_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,6 @@ def update
end
end

def show
@category = collection.find(params[:id])
enforce_permission_to :read, :category, category: @category
end

def destroy
@category = collection.find(params[:id])
enforce_permission_to :destroy, :category, category: @category
Expand Down
6 changes: 0 additions & 6 deletions decidim-admin/app/controllers/decidim/admin/concerns/has_attachment_collections.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,6 @@ def update
end
end

def show
@attachment_collection = collection.find(params[:id])
enforce_permission_to :read, :attachment_collection, attachment_collection: @attachment_collection
render template: "decidim/admin/attachment_collections/show"
end

def destroy
@attachment_collection = collection.find(params[:id])
enforce_permission_to :destroy, :attachment_collection, attachment_collection: @attachment_collection
Expand Down
6 changes: 0 additions & 6 deletions decidim-admin/app/controllers/decidim/admin/concerns/has_attachments.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,6 @@ def update
end
end

def show
@attachment = collection.find(params[:id])
enforce_permission_to(:read, :attachment, attachment:)
render template: "decidim/admin/attachments/show"
end

def destroy
@attachment = collection.find(params[:id])
enforce_permission_to(:destroy, :attachment, attachment:)
Expand Down
13 changes: 0 additions & 13 deletions decidim-admin/app/views/decidim/admin/attachment_collections/show.html.erb
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions decidim-admin/app/views/decidim/admin/attachments/show.html.erb
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions decidim-admin/app/views/decidim/admin/categories/show.html.erb
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions decidim-assemblies/lib/decidim/assemblies/admin_engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ class AdminEngine < ::Rails::Engine
end
end

resources :attachment_collections, controller: "assembly_attachment_collections"
resources :attachments, controller: "assembly_attachments"
resources :attachment_collections, controller: "assembly_attachment_collections", except: [:show]
resources :attachments, controller: "assembly_attachments", except: [:show]

resource :export, controller: "assembly_exports", only: :create

Expand All @@ -44,7 +44,7 @@ class AdminEngine < ::Rails::Engine
end

scope "/assemblies/:assembly_slug" do
resources :categories
resources :categories, except: [:show]

resources :components do
resource :permissions, controller: "component_permissions"
Expand Down
4 changes: 2 additions & 2 deletions decidim-blogs/lib/decidim/blogs/admin_engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ class AdminEngine < ::Rails::Engine

routes do
resources :posts do
resources :attachment_collections
resources :attachments
resources :attachment_collections, except: [:show]
resources :attachments, except: [:show]
end
root to: "posts#index"
end
Expand Down
4 changes: 2 additions & 2 deletions decidim-budgets/lib/decidim/budgets/admin_engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ class AdminEngine < ::Rails::Engine
resources :projects, exclude: [:index, :new, :create, :edit, :update, :destroy] do
get :proposals_picker, on: :collection

resources :attachment_collections
resources :attachments
resources :attachment_collections, except: [:show]
resources :attachments, except: [:show]
end

root to: "budgets#index"
Expand Down
6 changes: 3 additions & 3 deletions decidim-conferences/lib/decidim/conferences/admin_engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ class AdminEngine < ::Rails::Engine
end
end

resources :attachment_collections, controller: "conference_attachment_collections"
resources :attachments, controller: "conference_attachments"
resources :attachment_collections, controller: "conference_attachment_collections", except: [:show]
resources :attachments, controller: "conference_attachments", except: [:show]
end

scope "/conferences/:conference_slug" do
resources :categories
resources :categories, except: [:show]

resources :components do
resource :permissions, controller: "component_permissions"
Expand Down
4 changes: 2 additions & 2 deletions decidim-elections/lib/decidim/votings/admin_engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ class AdminEngine < ::Rails::Engine
end
resources :monitoring_committee_verify_elections, only: [:index]
resources :monitoring_committee_election_results, only: [:index, :show, :update]
resources :attachments, controller: "voting_attachments"
resources :attachment_collections, controller: "voting_attachment_collections"
resources :attachments, controller: "voting_attachments", except: [:show]
resources :attachment_collections, controller: "voting_attachment_collections", except: [:show]
resources :ballot_styles

resource :census, only: [:show, :destroy, :create], controller: "/decidim/votings/census/admin/census" do
Expand Down
2 changes: 1 addition & 1 deletion decidim-initiatives/lib/decidim/initiatives/admin_engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class AdminEngine < ::Rails::Engine
get :export
end

resources :attachments, controller: "initiative_attachments"
resources :attachments, controller: "initiative_attachments", except: [:show]

resources :committee_requests, only: [:index] do
member do
Expand Down
4 changes: 2 additions & 2 deletions decidim-meetings/lib/decidim/meetings/admin_engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ class AdminEngine < ::Rails::Engine
end
end
resources :agenda, except: [:index, :destroy]
resources :attachment_collections
resources :attachments
resources :attachment_collections, except: [:show]
resources :attachments, except: [:show]
resources :copies, controller: "meeting_copies", only: [:new, :create]
resource :poll, only: [:edit, :update], controller: "meetings_poll"
end
Expand Down
6 changes: 3 additions & 3 deletions decidim-participatory_processes/lib/decidim/participatory_processes/admin_engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ class AdminEngine < ::Rails::Engine
post :resend_invitation, to: "participatory_process_user_roles#resend_invitation"
end
end
resources :attachment_collections, controller: "participatory_process_attachment_collections"
resources :attachments, controller: "participatory_process_attachments"
resources :attachment_collections, controller: "participatory_process_attachment_collections", except: [:show]
resources :attachments, controller: "participatory_process_attachments", except: [:show]

resource :export, controller: "participatory_process_exports", only: :create

Expand All @@ -50,7 +50,7 @@ class AdminEngine < ::Rails::Engine
end

scope "/participatory_processes/:participatory_process_slug" do
resources :categories
resources :categories, except: [:show]

resources :components do
resource :permissions, controller: "component_permissions"
Expand Down
9 changes: 6 additions & 3 deletions decidim_app-design/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 18 additions & 18 deletions decidim_app-design/packages/webpacker/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading