Personal
/
cops
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Finish the refactoring for Json.

This commit is contained in:
Sébastien Lucas 2014-01-08 10:54:16 +01:00
parent 91aa062860
commit 1dfdd22f43
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
JSON_renderer.php
View File

@ -101,6 +101,22 @@ class JSONRenderer
return array ( "title" => $entry->title, "content" => $entry->content, "navlink" => $entry->getNavLink () );
}
public static function getContentArrayTypeahead ($page) {
$out = array ();
foreach ($page->entryArray as $entry) {
if ($entry instanceof EntryBook) {
array_push ($out, array ("class" => $entry->className, "title" => $entry->title, "navlink" => $entry->book->getDetailUrl ()));
} else {
if (empty ($entry->className) xor Base::noDatabaseSelected ()) {
array_push ($out, array ("class" => $entry->className, "title" => $entry->title, "navlink" => $entry->getNavLink ()));
} else {
array_push ($out, array ("class" => $entry->className, "title" => $entry->content, "navlink" => $entry->getNavLink ()));
}
}
}
return $out;
}
public static function getJson ($complete = false) {
global $config;
$page = getURLParam ("page", Base::PAGE_INDEX);
@ -114,7 +130,7 @@ class JSONRenderer
$currentPage->InitializeContent ();
if ($search) {
return $currentPage->getContentArrayTypeahead ();
return self::getContentArrayTypeahead ($currentPage);
}
$out = array ( "title" => $currentPage->title);

17
base.php
View File

@ -551,23 +551,6 @@ class Page
if (get_class ($this->entryArray [0]) == "EntryBook") return true;
return false;
}
public function getContentArrayTypeahead () {
$out = array ();
foreach ($this->entryArray as $entry) {
if ($entry instanceof EntryBook) {
array_push ($out, array ("class" => $entry->className, "title" => $entry->title, "navlink" => $entry->book->getDetailUrl ()));
} else {
if (empty ($entry->className) xor Base::noDatabaseSelected ()) {
array_push ($out, array ("class" => $entry->className, "title" => $entry->title, "navlink" => $entry->getNavLink ()));
} else {
array_push ($out, array ("class" => $entry->className, "title" => $entry->content, "navlink" => $entry->getNavLink ()));
}
}
}
return $out;
}
}
class PageAllAuthors extends Page