BUG 8614 "Al ir a login despliega una ventana nuevamente.." SOLVED
additionally was fixed - styles in installer - web services access denied
This commit is contained in:
@@ -14,12 +14,14 @@
|
||||
* (at your option) any later version.
|
||||
*
|
||||
***************************************************************************/
|
||||
var maborak = function(){
|
||||
var maborak = function(forceCssLoad){
|
||||
this.info={
|
||||
version :"0.3",
|
||||
name :"maborak",
|
||||
file :"maborak.js"
|
||||
},
|
||||
|
||||
this.forceCssLoad = forceCssLoad ? true : false;
|
||||
/**
|
||||
* Make this Class
|
||||
* @param options = Object{Options.for.class} || {};
|
||||
@@ -68,14 +70,15 @@ var maborak = function(){
|
||||
this.exec(this.fix.memoryLeak);
|
||||
|
||||
/* create Stylesheet BEGIN */
|
||||
/* erik: DEPRECATED! css should be separated accordind MVC pattern, all those css are moved on style.css to current skin*/
|
||||
/*
|
||||
var st =$dce('link');
|
||||
st.rel ='stylesheet';
|
||||
st.type ='text/css';
|
||||
st.href =this.info.base+'stylesheet/default.css';
|
||||
this.dom.capture("tag.head 0").appendChild(st);
|
||||
*/
|
||||
//erik: Now the core css is available just by demand
|
||||
if (this.forceCssLoad === true) {
|
||||
console.log('cargo css');
|
||||
var st =$dce('link');
|
||||
st.rel ='stylesheet';
|
||||
st.type ='text/css';
|
||||
st.href =this.info.base+'stylesheet/default.css';
|
||||
this.dom.capture("tag.head 0").appendChild(st);
|
||||
}
|
||||
/* create Stylesheet END */
|
||||
this.expand(this);
|
||||
return this;
|
||||
|
||||
@@ -46,7 +46,8 @@ echo '<?xml version="1.0" encoding="UTF-8" ?>';
|
||||
<script type='text/javascript' src='/sys/en/green/install/install.js'></script>
|
||||
<script type='text/javascript'>
|
||||
var ifr;
|
||||
var grid,winGrill, leimnud = new maborak();
|
||||
var forceCssLoad = true;
|
||||
var grid,winGrill, leimnud = new maborak(forceCssLoad);
|
||||
var inWIN = false;
|
||||
leimnud.make();
|
||||
leimnud.Package.Load("dom,validator,app,rpc,fx,drag,drop,panel,grid,abbr",{Instance:leimnud,Type:"module"});
|
||||
|
||||
@@ -518,7 +518,7 @@
|
||||
}
|
||||
else {
|
||||
// this is the blank list to allow execute scripts with no login (without session started)
|
||||
$noLoginFiles = array();
|
||||
$noLoginFiles = $noLoginFolders = array();
|
||||
$noLoginFiles[] = 'login';
|
||||
$noLoginFiles[] = 'authentication';
|
||||
$noLoginFiles[] = 'login_Ajax';
|
||||
@@ -532,14 +532,15 @@
|
||||
$noLoginFiles[] = 'showLogoFile';
|
||||
$noLoginFiles[] = 'forgotPassword';
|
||||
$noLoginFiles[] = 'retrivePassword';
|
||||
$noLoginFiles[] = 'services';
|
||||
$noLoginFiles[] = 'tracker';
|
||||
$noLoginFiles[] = 'defaultAjaxDynaform';
|
||||
$noLoginFiles[] = 'dynaforms_checkDependentFields';
|
||||
$noLoginFiles[] = 'cases_ShowDocument';
|
||||
|
||||
$noLoginFolders[] = 'services';
|
||||
$noLoginFolders[] = 'tracker';
|
||||
|
||||
//This sentence is used when you lost the Session
|
||||
if ( !in_array(SYS_TARGET, $noLoginFiles) && $bWE != true && $collectionPlugin != 'services') {
|
||||
if ( !in_array(SYS_TARGET, $noLoginFiles) && !in_array(SYS_COLLECTION, $noLoginFolders) && $bWE != true && $collectionPlugin != 'services') {
|
||||
$bRedirect = true;
|
||||
|
||||
if (isset($_GET['sid'])) {
|
||||
|
||||
Reference in New Issue
Block a user