From: <ni...@us...> - 2007-08-17 18:37:43
|
Update of /cvsroot/tikiwiki/tiki In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2913 Modified Files: tiki-mypage_ajax.php Log Message: [DEV] mypage: separate config/content Index: tiki-mypage_ajax.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-mypage_ajax.php,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- tiki-mypage_ajax.php 17 Aug 2007 13:26:55 -0000 1.19 +++ tiki-mypage_ajax.php 17 Aug 2007 18:34:23 -0000 1.20 @@ -99,7 +99,7 @@ $mywin->setContentType($contenttype); $comp=$mywin->getComponent(); $conf=$comp->configure($form_config); - $mywin->setContent($conf); + $mywin->setConfig($conf); $err=$mywin->commit(); if (strlen($err)) { $mywin->destroy(); @@ -119,7 +119,12 @@ if (is_string($mypage)) return mypage_error($mypage); - $mywin=$mypage->newWindow(); + if ($id_win) { + $mywin=$mypage->getWindow((int)$id_win); + } else { + $mywin=$mypage->newWindow(); + } + if (is_string($mywin)) return mypage_error($mywin); @@ -128,7 +133,7 @@ return mypage_error($comp); $conf=$comp->configure($form); - $mywin->setContent($conf); + $mywin->setConfig($conf); $err=$mywin->commit(); if (strlen($err)) { return mypage_error($err); @@ -137,7 +142,7 @@ return $objResponse; } -function mypage_win_prepareConfigure($id_mypage, $compname) { +function mypage_win_prepareConfigure($id_mypage, $id_win, $compname=null) { global $id_users; $objResponse = new xajaxResponse(); @@ -146,12 +151,26 @@ if (is_string($mypage)) return mypage_error($mypage); - $mywin=$mypage->newWindow(); // berk - $mywin->setContentType($compname); // berk - $comp=$mywin->getComponent(); // berk + if ($id_win && strlen($compname)) { + $mywin=$mypage->newWindow(); // berk + $mywin->setContentType($compname); // berk + $comp=$mywin->getComponent(); // berk + } else { + $mywin=$mypage->getWindow($id_win); + if (is_string($mywin)) + return mypage_error($mywin); + + $comp=$mywin->getComponent(); + if (is_string($comp)) + return mypage_error($comp); + } $objResponse->addAssign('mypage_divconfigure', 'innerHTML', $comp->getConfigureDiv()); + + if ($id_win && strlen($compname)) { + $comp->destroy(); // berk + } return $objResponse; } |