From 3789a7943761c1d0995bf2ec199c588c69d41699 Mon Sep 17 00:00:00 2001 From: erdgeist Date: Mon, 3 Aug 2026 18:16:53 +0200 Subject: Reroute events, tags, menuitems under /admin and reture events-without-a-page view --- app/controllers/events_controller.rb | 5 ---- app/views/events/index.html.erb | 1 - app/views/events/without_node.html.erb | 30 -------------------- config/locales/de.yml | 4 --- config/locales/en.yml | 4 --- config/routes.rb | 50 +++++++++++++++------------------- 6 files changed, 22 insertions(+), 72 deletions(-) delete mode 100644 app/views/events/without_node.html.erb diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb index 818459c4..d581de16 100644 --- a/app/controllers/events_controller.rb +++ b/app/controllers/events_controller.rb @@ -18,11 +18,6 @@ class EventsController < ApplicationController end end - # GET /events/without_node - def without_node - @events = Event.where(node_id: nil).order(:start_time).paginate(page: params[:page], per_page: 25) - end - # GET /events/1 # GET /events/1.xml def show diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb index d07d6f82..a2710c2a 100644 --- a/app/views/events/index.html.erb +++ b/app/views/events/index.html.erb @@ -4,7 +4,6 @@ <%= link_to new_event_path, class: 'action_button' do %> <%= icon("plus", library: "tabler", "aria-hidden": true) %> <%= t(".create_event") %> <% end %> - <%= link_to t(".without_page_link"), without_node_events_path %> <%= will_paginate @events %> diff --git a/app/views/events/without_node.html.erb b/app/views/events/without_node.html.erb deleted file mode 100644 index e59eedc7..00000000 --- a/app/views/events/without_node.html.erb +++ /dev/null @@ -1,30 +0,0 @@ -

<%= t(".title") %>

- -<%= link_to t(".all_events_link"), events_path %> -<%= link_to new_event_path, class: 'action_button' do %> - <%= icon("plus", library: "tabler", "aria-hidden": true) %> <%= t("events.index.create_event") %> -<% end %> - -<%= will_paginate @events %> - - - - - - - - - - - -<% @events.each do |event| %> - - - - - - - - -<% end %> -
<%= t("admin.columns.title") %><%= Event.human_attribute_name(:start_time) %><%= Event.human_attribute_name(:end_time) %><%= Event.human_attribute_name(:allday) %><%= Event.human_attribute_name(:url) %>
<%= link_to event.display_title, event %><%= admin_datetime(event.start_time) %><%= admin_datetime(event.end_time) %><%= t("admin.common.#{event.allday ? "yes" : "no"}") %><%=h event.url %><%= external_url_link(event.url) %>
diff --git a/config/locales/de.yml b/config/locales/de.yml index 9428c4be..2139e0da 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -574,7 +574,6 @@ de: index: title: "Termine" create_event: "Termin anlegen" - without_page_link: "Termine ohne Seite anzeigen →" edit_link: "bearbeiten" show: title: "Termin" @@ -585,9 +584,6 @@ de: title: "Termin bearbeiten" change_node: "Node ändern" change_node_hint: "Verknüpft den Termin mit einem anderen Node (selten nötig)." - without_node: - title: "Termine ohne Node" - all_events_link: "← Alle Termine" form: node_hint: "Optional — Node suchen und auswählen, um diesen Termin mit einer Seite zu verknüpfen." recurrence: "Wiederholung" diff --git a/config/locales/en.yml b/config/locales/en.yml index dcf4275d..b4d6e4ae 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -521,15 +521,11 @@ en: index: title: "Events" create_event: "Create event" - without_page_link: "View events without a page →" edit_link: "edit" edit: title: "Editing event" change_node: "Change node" change_node_hint: "This will re-link the event to a different node — rarely needed." - without_node: - title: "Events without a node" - all_events_link: "← All events" show: title: "Event" title_for_node: "Event for node %{path}" diff --git a/config/routes.rb b/config/routes.rb index d19ac25b..fe38d6d7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -21,20 +21,13 @@ Cccms::Application.routes.draw do # Adding a new locale requires updating all three locations. scope '(:locale)', locale: /de|en/ do - resources :tags - - resources :events do - collection do - get :without_node - end - end - - get 'pages/:id/preview', to: 'pages#preview', as: :preview_page - - get 'preview/:token', to: 'shared_previews#show', as: :shared_preview + get 'pages/:id/preview', to: 'pages#preview', as: :preview_page + get 'preview/:token', to: 'shared_previews#show', as: :shared_preview scope '/admin' do + resources :events resources :assets + resources :tags resources :nodes do collection do @@ -84,6 +77,24 @@ Cccms::Application.routes.draw do end end + resources :menu_items, :except => :show do + member do + post :sort + post :move_up + post :move_down + end + end + + resources :users, :except => :destroy do + member do + put :reset_otp + put :deactivate + put :reactivate + put :grant_redaktion + put :revoke_redaktion + end + end + match '' => 'admin#index', :as => :admin, :via => :get match 'search' => 'admin#search', :as => :admin_search, :via => :get match 'menu_search' => 'admin#menu_search', :as => :admin_menu_search, :via => :get @@ -97,29 +108,12 @@ Cccms::Application.routes.draw do match '/login' => 'sessions#new', :as => :login, :via => :get match 'search' => 'search#index', :as => :search, :via => :get - resources :users, :except => :destroy do - member do - put :reset_otp - put :deactivate - put :reactivate - put :grant_redaktion - put :revoke_redaktion - end - end resource :otp_enrollment, :only => [:show, :create, :update, :destroy] resource :otp_challenge, :only => [:new, :create] resource :elevation, :only => [:new, :create, :destroy] do post :renew end - resources :menu_items, :except => :show do - member do - post :sort - post :move_up - post :move_down - end - end - resource :session get 'rss/updates', :to => 'rss#updates', :as => :rss, :defaults => { :format => :xml } -- cgit v1.3