[Phpgroupware-cvs] CVS: sitemgr/inc class.Admin_ManageCategories_UI.inc.php,1.3,1.4 class.contributor_ManagePage_UI.inc.php,1.5,1.6

[Patrick Walsh <address@hidden>]

Update of /cvsroot/phpgroupware/sitemgr/inc
In directory subversions:/tmp/cvs-serv16142

Modified Files:
        class.Admin_ManageCategories_UI.inc.php 
        class.contributor_ManagePage_UI.inc.php 
Log Message:
Fixed bugs: 
22) New categories can't choose "No Parent"
23) Page edits set category to zero


Index: class.Admin_ManageCategories_UI.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/sitemgr/inc/class.Admin_ManageCategories_UI.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.Admin_ManageCategories_UI.inc.php     5 Sep 2002 09:06:03 -0000       
1.3
--- class.Admin_ManageCategories_UI.inc.php     11 Sep 2002 06:22:44 -0000      
1.4
***************
*** 297,303 ****
                {
                        $option_list=$this->cat_bo->getCategoryOptionList();
!                       if (!(int) $selected_id)
                        {
                                $selected=' SELECTED';
                        }
                        $retval="\n".'<SELECT NAME="parent">'."\n";
--- 297,307 ----
                {
                        $option_list=$this->cat_bo->getCategoryOptionList();
!                       if (!$selected_id)
                        {
                                $selected=' SELECTED';
+                       }
+                       if (!$skip_id)
+                       {
+                               $skip_id = -1;
                        }
                        $retval="\n".'<SELECT NAME="parent">'."\n";

Index: class.contributor_ManagePage_UI.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/sitemgr/inc/class.contributor_ManagePage_UI.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.contributor_ManagePage_UI.inc.php     5 Sep 2002 09:06:03 -0000       
1.5
--- class.contributor_ManagePage_UI.inc.php     11 Sep 2002 06:22:44 -0000      
1.6
***************
*** 76,80 ****
                                }
                                $this->t->set_var('add_edit','Edit Page');
!                               
$this->t->set_var('move_to',$this->getParentOptions($page->cat_id));
                        }
                        else
--- 76,80 ----
                                }
                                $this->t->set_var('add_edit','Edit Page');
!                               
$this->t->set_var('move_to',$this->getParentOptions($this->page->cat_id));
                        }
                        else
***************
*** 125,135 ****
                {
                        global $hidden;
!                       global $btnAddPage;
!                       global $btnDelete;
!                       global $btnEditPage;
                        global $btnPrev;
                        global $pageid;
                        global $btnSave;
-                       global $btnReset;
                        global $pageid;
                        global $category_id;
--- 125,132 ----
                {
                        global $hidden;
!                       global $btnAddPage, $btnDelete, $btnEditPage;
                        global $btnPrev;
                        global $pageid;
                        global $btnSave;
                        global $pageid;
                        global $category_id;
***************
*** 144,148 ****
                        $common_ui = CreateObject('sitemgr.Common_UI',True);
                        $common_ui->DisplayHeader();
-                       //echo PHPGW_TEMPLATE_DIR;
                        
                        if($btnSave && !$error)
--- 141,144 ----
***************
*** 250,253 ****
--- 246,251 ----
                                                                        <input 
type="hidden" name="category_id" value="'.
                                                                                
$this->cat_id.'">
+                                                                       <input 
type="hidden" name="parent" value="'.
+                                                                               
$this->cat_id.'">
                                                                        <input 
type="hidden" name="pageid" value="'. 
                                                                                
$this->page_id .'">
***************
*** 262,265 ****
--- 260,265 ----
                                                                        <input 
type="hidden" name="category_id" value="'.
                                                                                
$this->cat_id.'">
+                                                                       <input 
type="hidden" name="parent" value="'.
+                                                                               
$this->cat_id.'">
                                                                        
</form>');
                                                                
$this->t->parse('PBlock', 'PageBlock', true);
***************
*** 296,300 ****
                {
                        $option_list=$this->categorybo->getCategoryOptionList();
!                       if (!(int) $selected_id)
                        {
                                $selected=' SELECTED'; 
--- 296,300 ----
                {
                        $option_list=$this->categorybo->getCategoryOptionList();
!                       if (!$selected_id)
                        {
                                $selected=' SELECTED';