fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 8614 "Al ir a login despliega una ventana nuevamente.." SOLVED

Browse Source 
additionally was fixed
- styles in installer
- web services access denied
This commit is contained in:
Erik Amaru Ortiz
2012-02-28 10:55:17 -04:00
parent 23ddf74e79
commit 69e2336871
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gulliver/js/maborak/core/maborak.js
View File

@@ -14,12 +14,14 @@
* (at your option) any later version. * (at your option) any later version.
* *
***************************************************************************/ ***************************************************************************/
var maborak = function(){ var maborak = function(forceCssLoad){
this.info={ this.info={
version :"0.3", version :"0.3",
name :"maborak", name :"maborak",
file :"maborak.js" file :"maborak.js"
}, },
this.forceCssLoad = forceCssLoad ? true : false;
/** /**
* Make this Class * Make this Class
* @param options = Object{Options.for.class} || {}; * @param options = Object{Options.for.class} || {};
@@ -68,14 +70,15 @@ var maborak = function(){
this.exec(this.fix.memoryLeak); this.exec(this.fix.memoryLeak);
/* create Stylesheet BEGIN */ /* create Stylesheet BEGIN */
/* erik: DEPRECATED! css should be separated accordind MVC pattern, all those css are moved on style.css to current skin*/ //erik: Now the core css is available just by demand
/* if (this.forceCssLoad === true) {
console.log('cargo css');
var st =$dce('link'); var st =$dce('link');
st.rel ='stylesheet'; st.rel ='stylesheet';
st.type ='text/css'; st.type ='text/css';
st.href =this.info.base+'stylesheet/default.css'; st.href =this.info.base+'stylesheet/default.css';
this.dom.capture("tag.head 0").appendChild(st); this.dom.capture("tag.head 0").appendChild(st);
*/ }
/* create Stylesheet END */ /* create Stylesheet END */
this.expand(this); this.expand(this);
return this; return this;

3
workflow/engine/methods/install/install.php
View File

@@ -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' src='/sys/en/green/install/install.js'></script>
<script type='text/javascript'> <script type='text/javascript'>
var ifr; var ifr;
var grid,winGrill, leimnud = new maborak(); var forceCssLoad = true;
var grid,winGrill, leimnud = new maborak(forceCssLoad);
var inWIN = false; var inWIN = false;
leimnud.make(); leimnud.make();
leimnud.Package.Load("dom,validator,app,rpc,fx,drag,drop,panel,grid,abbr",{Instance:leimnud,Type:"module"}); leimnud.Package.Load("dom,validator,app,rpc,fx,drag,drop,panel,grid,abbr",{Instance:leimnud,Type:"module"});

9
workflow/public_html/sysGeneric.php
View File

@@ -518,7 +518,7 @@
} }
else { else {
// this is the blank list to allow execute scripts with no login (without session started) // this is the blank list to allow execute scripts with no login (without session started)
$noLoginFiles = array(); $noLoginFiles = $noLoginFolders = array();
$noLoginFiles[] = 'login'; $noLoginFiles[] = 'login';
$noLoginFiles[] = 'authentication'; $noLoginFiles[] = 'authentication';
$noLoginFiles[] = 'login_Ajax'; $noLoginFiles[] = 'login_Ajax';
@@ -532,14 +532,15 @@
$noLoginFiles[] = 'showLogoFile'; $noLoginFiles[] = 'showLogoFile';
$noLoginFiles[] = 'forgotPassword'; $noLoginFiles[] = 'forgotPassword';
$noLoginFiles[] = 'retrivePassword'; $noLoginFiles[] = 'retrivePassword';
$noLoginFiles[] = 'services';
$noLoginFiles[] = 'tracker';
$noLoginFiles[] = 'defaultAjaxDynaform'; $noLoginFiles[] = 'defaultAjaxDynaform';
$noLoginFiles[] = 'dynaforms_checkDependentFields'; $noLoginFiles[] = 'dynaforms_checkDependentFields';
$noLoginFiles[] = 'cases_ShowDocument'; $noLoginFiles[] = 'cases_ShowDocument';
$noLoginFolders[] = 'services';
$noLoginFolders[] = 'tracker';
//This sentence is used when you lost the Session //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; $bRedirect = true;
if (isset($_GET['sid'])) { if (isset($_GET['sid'])) {