Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 1022

Přidáno uživatelem Michal Kliment před více než 13 roky(ů)

Merge zmen z testingu do vetve s vyhledavanim a filtrovanim + odkomentovani fulltextoveho vyhledavani. Vetev je tarka hotova, jeste zbyva otestovat...

Zobrazit rozdíly:

freenetis/branches/search_filters/application/i18n/cs_CZ/database.php
<?php defined('SYSPATH') or die('No direct access allowed.');
$lang = array
(
'error' => 'Chyba v SQL dotazu - %s'
);
?>
freenetis/branches/search_filters/application/views/main.php
if ((history.length == 1 || history.length == 2) && document.referrer == "")
$.post("<?php echo url_lang::base()?>json/insert_path/");*/
/*var delay = (function(){
var delay = (function(){
var timer = 0;
return function(callback, ms){
clearTimeout (timer);
......
e.stopPropagation();
if (this.id != 'whisper' && this.id != 'keyword')
$("#whisper").hide ('slow');
});*/
});
$.validator.addMethod('ip_address', function(value) {
return value.match(/^((25[0-5])|(2[0-4][0-9])|(1[0-9][0-9])|([1-9][0-9])|[0-9])\.((25[0-5])|(2[0-4][0-9])|(1[0-9][0-9])|([1-9][0-9])|[0-9])\.((25[0-5])|(2[0-4][0-9])|(1[0-9][0-9])|([1-9][0-9])|[0-9])\.((25[0-5])|(2[0-4][0-9])|(1[0-9][0-9])|([1-9][0-9])|[0-9])$/);
......
<?php
if ($this->session->get('user_id'))
{
/*echo form::open(url_lang::base().'search', array('method' => 'get', 'autocomplete' => 'off', 'class' => 'search'));
echo form::open(url_lang::base().'search', array('method' => 'get', 'autocomplete' => 'off', 'class' => 'search'));
echo form::input('keyword',(isset($keyword) ? $keyword : ''));
echo form::imagebutton('search_submit', url::base().'media/images/icons/search.gif');
echo form::close();*/
echo form::close();
?>
<div id="whisper"></div>
<?php
freenetis/branches/search_filters/application/views/filter_form_template.php
}
});
}
else if (callback != '')
else if (callback != undefined)
{
$(this).next().next().autocomplete({
minLength: minlength,
source: callback
});
}
else
$(this).next().next().autocomplete("disable");
$(this).next().next().next().next().val(tables[$(this).val()]);
}
freenetis/branches/search_filters/system/libraries/drivers/Database/Mysql.php
if ($result == FALSE)
{
// SQL error
throw new Kohana_Database_Exception('database.error', mysql_error($link).' - '.$sql);
throw new Kohana_Database_Exception('database.error', mysql_error($link));
}
else
{

Také k dispozici: Unified diff