Commit e6b2483a authored by Clément Damiens's avatar Clément Damiens

Merge remote-tracking branch 'origin/master'

parents 3fe003a5 d4f03a45
......@@ -179,7 +179,6 @@ function autoCompleteSearch(indexMin, indexMax, callBack, notUrl){
}
str = "";
mylog.log("agenda. autoCompleteSearch", searchObject.types, ( results.length > 0 || ( results.length == 0 && agenda.noResult == false) ));
if( typeof agenda != "undefined" &&
searchObject.types.length == 1 &&
$.inArray( "events", searchObject.types) >= 0 &&
......
......@@ -118,6 +118,7 @@
adminPanel.params.subView = true;
}
jQuery(document).ready(function() {
mylog.log("---admin/index.php");
if(superAdmin == "" && sourceAdmin == "" && !authorizedAdmin){
urlCtrl.loadByHash("");
bootbox.dialog({message:'<div class="alert-danger text-center"><strong><?php echo Yii::t("common","You are not authorized to acces adminastrator panel ! <br/>Connect you or contact us in order to become admin system") ?></strong></div>'});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment