Resolve test failures

This commit is contained in:
Will Rossiter 2014-12-16 23:07:31 +13:00
parent 3753c331d4
commit 473b830867
5 changed files with 24 additions and 20 deletions

View File

@ -121,11 +121,9 @@ class DocumentationManifest {
$path = $this->getRealPath($details['Path']);
$key = (isset($details['Key'])) ? $details['Key'] : $details['Title'];
if($path && !is_dir($path)) {
throw new Exception($path . ' is not a valid documentation directory');
} else if(!$path) {
return;
if(!$path || !is_dir($path)) {
throw new Exception($details['Path'] . ' is not a valid documentation directory');
}
$version = (isset($details['Version'])) ? $details['Version'] : '';

View File

@ -316,15 +316,19 @@ class DocumentationViewer extends Controller {
$current = $this->getEntity();
foreach($entities as $entity) {
$checkLang = $entity->getLanguage();
$checkVers = $entity->getVersion();
// only show entities with the same language
if($entity->getLanguage() !== $this->getLanguage()) {
// only show entities with the same language or any entity that
// isn't registered under any particular language (auto detected)
if($checkLang && $checkLang !== $this->getLanguage()) {
continue;
}
// only show entities with the same version
if($entity->getVersion() !== $current->getVersion()) {
continue;
if($current && $checkVers) {
if($entity->getVersion() !== $current->getVersion()) {
continue;
}
}
$mode = 'link';
@ -459,7 +463,7 @@ class DocumentationViewer extends Controller {
* @return ArrayList
*/
public function getVersions() {
return $this->manifest->getVersions($this->getEntity());
return $this->getManifest()->getVersions($this->getEntity());
}
/**

View File

@ -3,13 +3,12 @@
class DocumentationSearchForm extends Form {
public function __construct($controller) {
$versions = HiddenField::create(
'Versions',
_t('DocumentationViewer.VERSIONS', 'Versions'),
implode(',', $controller->getManifest()->getAllVersions())
);
//pass through the current version
$page = $controller->getPage();
if($page){
$versions = HiddenField::create('Versions','Versions',$page->getEntity()->getVersion());
}
$fields = new FieldList(
TextField::create('q', _t('DocumentationViewer.SEARCH', 'Search'), '')
->setAttribute('placeholder', _t('DocumentationViewer.SEARCH', 'Search')),

View File

@ -48,7 +48,7 @@ class RebuildLuceneDocsIndex extends BuildTask {
$index->removeReference();
}
catch (Zend_Search_Lucene_Exception $e) {
// user_error($e);
user_error($e);
}
try {
@ -61,7 +61,7 @@ class RebuildLuceneDocsIndex extends BuildTask {
// includes registration
$manifest = new DocumentationManifest(true);
$pages = $manifest->getPages();
if($pages) {
$count = 0;

View File

@ -135,6 +135,7 @@
$(this).removeClass('hover');
});
/*
$(".search input").live("keyup", function(e) {
clearTimeout($.data(this, 'timer'));
@ -185,7 +186,9 @@
return false;
}, 100));
};
});
*/
/** ---------------------------------------------
* LANGAUGE SELECTER