Fix load of publications at startup

This commit is contained in:
Romain Neutron
2012-02-09 16:38:28 +01:00
parent e956fb6de1
commit 6dea14b12e
2 changed files with 15 additions and 17 deletions

View File

@@ -948,14 +948,18 @@
</span> </span>
{% endif %} {% endif %}
</div> </div>
{% set bool = 0 %} <div id="answers" class=" PNB10" style="top:48px;bottom:30px;">
{% if user.getPrefs('start_page') == 'QUERY' or user.getPrefs('start_page') == 'LAST_QUERY' %} <script>
{% set bool = 1 %} $(document).ready(function(){
{% endif %} {% if user.getPrefs('start_page') == 'QUERY' %}
<div id="answers" class="{% if bool == 1 %}loading{% endif %} PNB10" style="top:48px;bottom:30px;"> $('form[name="phrasea_query"]').addClass('triggerAfterInit')
{% if bool == 0 %} {% elseif user.getPrefs('start_page') == 'LAST_QUERY' %}
{{start_page_content}} $('form[name="phrasea_query"]').addClass('triggerAfterInit')
{% elseif user.getPrefs('start_page') == 'PUBLI' %}
getHome('PUBLI');
{% endif %} {% endif %}
});
</script>
</div> </div>
<div id="answers_status" class="PNB"> <div id="answers_status" class="PNB">
<table> <table>
@@ -1310,16 +1314,6 @@
<script type="text/javascript" src="{{registry.get('GV_STATIC_URL')}}/include/minify/f=include/tinymce/jscripts/tiny_mce/tiny_mce.js"></script> <script type="text/javascript" src="{{registry.get('GV_STATIC_URL')}}/include/minify/f=include/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
<script type="text/javascript"> <script type="text/javascript">
{% if user.getPrefs('start_page') == 'QUERY' or user.getPrefs('start_page') == 'LAST_QUERY' %}
$(document).ready(function(){
newSearch();
});
{% endif %}
$(document).ready(function(){ $(document).ready(function(){
p4.reg_delete="{% if user.getPrefs("warning_on_delete_story") %}true{% else %}false{% endif %}"; p4.reg_delete="{% if user.getPrefs("warning_on_delete_story") %}true{% else %}false{% endif %}";
}); });

View File

@@ -538,6 +538,10 @@ function initAnswerForm(){
}); });
return false; return false;
}); });
if($('form[name="phrasea_query"]').hasClass('triggerAfterInit'))
{
$('form[name="phrasea_query"]').removeClass('triggerAfterInit').trigger('submit');
}
} }
function answerSizer() function answerSizer()
{ {