diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-23 06:06:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-23 06:06:01 +0300 |
commit | 8c7eab92cd0009f55cb999bbade43e0f969c137e (patch) | |
tree | 180cac6632448a211ddbe555191574c98e8dc385 /app/models/wiki_page.rb | |
parent | dffeff5520e861dc6e7319b690c573186bbbd22e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/wiki_page.rb')
-rw-r--r-- | app/models/wiki_page.rb | 43 |
1 files changed, 15 insertions, 28 deletions
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index 1fa29e5b933..6b3cb0b39d8 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -15,30 +15,7 @@ class WikiPage end def self.model_name - ActiveModel::Name.new(self, nil, 'wiki') - end - - # Sorts and groups pages by directory. - # - # pages - an array of WikiPage objects. - # - # Returns an array of WikiPage and WikiDirectory objects. The entries are - # sorted by alphabetical order (directories and pages inside each directory). - # Pages at the root level come before everything. - def self.group_by_directory(pages) - return [] if pages.blank? - - pages.each_with_object([]) do |page, grouped_pages| - next grouped_pages << page unless page.directory.present? - - directory = grouped_pages.find do |obj| - obj.is_a?(WikiDirectory) && obj.slug == page.directory - end - - next directory.pages << page if directory - - grouped_pages << WikiDirectory.new(page.directory, [page]) - end + ActiveModel::Name.new(self, nil, 'wiki_page') end def self.unhyphenize(name) @@ -66,6 +43,16 @@ class WikiPage Gitlab::HookData::WikiPageBuilder.new(self).build end + # Create a new WikiPage + # + # == Parameters: + # wiki:: + # A `ProjectWiki` model object + # page:: + # A `Gitlab::Git::WikiPage` business object, to which this class provides a facade + # persisted:: + # Is this page fully saved on disk? + # def initialize(wiki, page = nil, persisted = false) @wiki = wiki @page = page @@ -250,10 +237,10 @@ class WikiPage end end - # Relative path to the partial to be used when rendering collections - # of this object. - def to_partial_path - 'projects/wikis/wiki_page' + def to_partial_path(context = nil) + name = [context, 'wiki_page'].compact.join('_') + + "projects/wiki_pages/#{name}" end def id |