diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/nodes_controller.rb | 4 | ||||
| -rw-r--r-- | app/models/node.rb | 7 | ||||
| -rw-r--r-- | app/views/nodes/_recent_change_item.html.erb | 9 | ||||
| -rw-r--r-- | app/views/nodes/recent.html.erb | 7 |
4 files changed, 0 insertions, 27 deletions
diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb index 6caa827..9c84420 100644 --- a/app/controllers/nodes_controller.rb +++ b/app/controllers/nodes_controller.rb | |||
| @@ -223,10 +223,6 @@ class NodesController < ApplicationController | |||
| 223 | @nodes = index_matching(Node.drafts_and_autosaves) | 223 | @nodes = index_matching(Node.drafts_and_autosaves) |
| 224 | end | 224 | end |
| 225 | 225 | ||
| 226 | def recent | ||
| 227 | @nodes = index_matching(Node.recently_changed) | ||
| 228 | end | ||
| 229 | |||
| 230 | def mine | 226 | def mine |
| 231 | base = Node.joins(:pages) | 227 | base = Node.joins(:pages) |
| 232 | .where("pages.user_id = ? or pages.editor_id = ?", current_user, current_user) | 228 | .where("pages.user_id = ? or pages.editor_id = ?", current_user, current_user) |
diff --git a/app/models/node.rb b/app/models/node.rb index 0796ea4..746b7c7 100644 --- a/app/models/node.rb +++ b/app/models/node.rb | |||
| @@ -533,13 +533,6 @@ class Node < ApplicationRecord | |||
| 533 | throw :abort | 533 | throw :abort |
| 534 | end | 534 | end |
| 535 | 535 | ||
| 536 | def self.recently_changed | ||
| 537 | includes(:head).where( | ||
| 538 | "pages.updated_at < ? AND pages.updated_at > ? AND nodes.parent_id IS NOT NULL", | ||
| 539 | Time.now, Time.now - 14.days | ||
| 540 | ).order("pages.updated_at desc").references(:head) | ||
| 541 | end | ||
| 542 | |||
| 543 | protected | 536 | protected |
| 544 | def lock_for! current_user | 537 | def lock_for! current_user |
| 545 | self.lock_owner = current_user | 538 | self.lock_owner = current_user |
diff --git a/app/views/nodes/_recent_change_item.html.erb b/app/views/nodes/_recent_change_item.html.erb deleted file mode 100644 index 754a775..0000000 --- a/app/views/nodes/_recent_change_item.html.erb +++ /dev/null | |||
| @@ -1,9 +0,0 @@ | |||
| 1 | <li> | ||
| 2 | <div> | ||
| 3 | <%= link_to title_for_node(node), node_path(node) %> | ||
| 4 | <span class="field_hint"><%= link_to_path("#{node.unique_name} ↗", node.unique_name) %></span> | ||
| 5 | </div> | ||
| 6 | <span class="dashboard_widget_meta"> | ||
| 7 | <%= (editor = node_head_editor(node)) ? t("last_edited_by", editor: editor) : t("last_edited") %>, <%= relative_time_phrase(node.head.updated_at) %> | ||
| 8 | </span> | ||
| 9 | </li> | ||
diff --git a/app/views/nodes/recent.html.erb b/app/views/nodes/recent.html.erb deleted file mode 100644 index d256253..0000000 --- a/app/views/nodes/recent.html.erb +++ /dev/null | |||
| @@ -1,7 +0,0 @@ | |||
| 1 | <h1>Recently changed</h1> | ||
| 2 | |||
| 3 | <%= will_paginate @nodes %> | ||
| 4 | <ul id="recent_changes_full_list"> | ||
| 5 | <%= render partial: "nodes/recent_change_item", collection: @nodes, as: :node %> | ||
| 6 | </ul> | ||
| 7 | <%= will_paginate @nodes %> | ||
