hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
This commit is contained in:
Nicolas Le Goff
2014-02-05 15:25:52 +01:00
parent 04bb823a8b e9f1a2a257
commit 3b9b5a3240
7 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
View File

@@ -341,6 +341,7 @@ class PhraseaEngine implements SearchEngineInterface
$this->initialize();
$this->checkSession();
$this->clearAllCache(new \DateTime('-1 hour'));
assert(is_int($offset));
assert($offset >= 0);

9
lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php
View File

@@ -206,15 +206,6 @@ interface SearchEngineInterface
*/
public function clearCache();
/**
* Clear all cache prior to the given date (if applicable)
*
* If no date provided, clear all entries
*
* @return SearchEngineInterface
*/
public function clearAllCache(\DateTime $date = null);
/**
* Returns a subscriber
*

8
lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
View File

@@ -1061,12 +1061,4 @@ class SphinxSearchEngine implements SearchEngineInterface
{
return $this;
}
/**
* @inheritdoc
*/
public function clearAllCache(\DateTime $date = null)
{
return $this;
}
}

6
templates/web/prod/upload/upload-flash.html.twig
View File

@@ -152,7 +152,11 @@
load: function(event, ui)
{
ui.tab.find('span').empty();
}
},
create : function () {
$('#tab-upload').css('overflow', 'hidden');
},
heightStyle: "fill"
});
//Show the good collection status box

6
templates/web/prod/upload/upload.html.twig
View File

@@ -179,7 +179,11 @@ $(document).ready(function () {
load: function(event, ui)
{
ui.tab.find('span').empty();
}
},
create : function () {
$('#tab-upload').css('overflow', 'hidden');
},
heightStyle: "fill"
});
//Show the good collection status box

4
www/skins/prod/000000/prodcolor.css
View File

@@ -3927,9 +3927,7 @@ dans l'onglet thesaurus : arbres, menus contextuels
height: 100%;
}
#uploadBox #tab-upload,
#uploadBox #tab-lazaret {
height: 90%;
#uploadBox .ui-tabs .ui-tabs-panel {
padding: 20px;
}

3
www/skins/prod/959595/prodcolor.css
View File

@@ -4051,8 +4051,7 @@ dans l'onglet thesaurus : arbres, menus contextuels
height: 100%;
}
#uploadBox #tab-upload,
#uploadBox #tab-lazaret {
#uploadBox .ui-tabs .ui-tabs-panel {
height: 90%;
padding: 20px;
}