X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.js;h=618ddda7ff237fa3d3148cf63355dec3767847bf;hp=18798df310e5e37dcfe504a6f2e253adfbd3547a;hb=c1af5e6bb6064e88469651271f4d9aaff34d69c0;hpb=593a134c543e7eb953fdac82797b110b87fbdd85 diff --git a/Pman.js b/Pman.js index 18798df3..618ddda7 100644 --- a/Pman.js +++ b/Pman.js @@ -358,7 +358,7 @@ Pman = new Roo.Document( Pman.Dialog.PersonStaff.show( { id : 0, - company_id : Pman.Login.authUser.company_id_id * 1, + company_id : Pman.Login.authUser.company_id * 1, company_id_name : Pman.Login.authUser.company_id_name }, function(data) { forceAdmin(data); @@ -366,6 +366,7 @@ Pman = new Roo.Document( ); return; } + Roo.state.Manager.set('Pman.Login.username', data.email), window.onbeforeunload = false; document.location = baseURL + '?ts=' + Math.random(); @@ -393,7 +394,7 @@ Pman = new Roo.Document( if (Pman.Login.authUser.id < 0) { // admin company has been created - create the user.. - if (Pman.Login.authUser.company_id_id* 1 > 0) { + if (Pman.Login.authUser.company_id* 1 > 0) { forceAdmin(); return; } @@ -550,7 +551,7 @@ Pman = new Roo.Document( genericDelete : function(tab,tbl) { var r = []; - + var s = tab.grid.getSelectionModel().getSelections(); if (!s.length) { @@ -592,6 +593,7 @@ Pman = new Roo.Document( }, failure: function(act) { + Roo.log(act); var msg = ''; try { @@ -771,7 +773,7 @@ Pman = new Roo.Document( xregister : function(obj) { - Roo.log(obj); + // work out owner.. if (!Pman.appModules === false) { Pman.appModules = typeof(AppModules ) == 'undefined'? [] : @@ -955,9 +957,8 @@ Pman = new Roo.Document( // Roo.log("CALLING XComponent register with : " + obj.name); - - // this will call xregister as it's the on.register handler.. Roo.log(obj); + // this will call xregister as it's the on.register handler.. Roo.XComponent.register(obj.isTop ? obj : Roo.apply(obj.module, obj)); } ,