From 509afaa6f73bf96aba41bc637a3af9980de176c1 Mon Sep 17 00:00:00 2001
From: wangyidong <wyd621@163.com>
Date: Fri, 6 Aug 2021 18:12:18 +0800
Subject: [PATCH]  * adjust upgrade.

---
 module/caselib/model.php               |  2 +-
 module/doc/control.php                 |  1 +
 module/upgrade/control.php             |  9 +++++----
 module/upgrade/model.php               | 27 +-------------------------
 module/upgrade/view/mergerepo.html.php | 11 -----------
 5 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/module/caselib/model.php b/module/caselib/model.php
index b0ebca73a3..efd7ce5c17 100644
--- a/module/caselib/model.php
+++ b/module/caselib/model.php
@@ -475,7 +475,7 @@ class caselibModel extends model
             }
             else
             {
-                $caseData->project    = $this->session->project;
+                $caseData->project    = (int)$this->session->project;
                 $caseData->version    = 1;
                 $caseData->openedBy   = $this->app->user->account;
                 $caseData->openedDate = $now;
diff --git a/module/doc/control.php b/module/doc/control.php
index 58b07227a7..7724b65df6 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -886,6 +886,7 @@ class doc extends control
         $lib = $this->doc->getLibById($libID);
         if(!empty($lib) and $lib->deleted == '1') $appendLib = $libID;
 
+        if($this->config->systemMode == 'classic' and $type == 'project') $type = 'execution';
         list($libs, $libID, $object, $objectID) = $this->doc->setMenuByType($type, $objectID, $libID, $appendLib);
 
         /* Set Custom. */
diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index 8dada6c542..bab1934572 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -578,9 +578,9 @@ class upgrade extends control
             die(js::locate($this->createLink('upgrade', 'mergeRepo'), 'parent'));
         }
 
-        $repos = $this->dao->select('id, name')->from(TABLE_REPO)->where('deleted')->eq(0)->andWhere('product')->eq('')->fetchPairs();
-
-        if(empty($repos))
+        $repos    = $this->dao->select('id, name')->from(TABLE_REPO)->where('deleted')->eq(0)->andWhere('product')->eq('')->fetchPairs();
+        $products = $this->dao->select('id, name')->from(TABLE_PRODUCT)->where('deleted')->eq(0)->fetchPairs();
+        if(empty($repos) or empty($products))
         {
             $this->loadModel('setting')->deleteItems('owner=system&module=common&section=global&key=upgradeStep');
             die(js::locate($this->createLink('upgrade', 'afterExec', "fromVersion=&processed=no")));
@@ -588,8 +588,9 @@ class upgrade extends control
 
         $this->view->title    = $this->lang->upgrade->mergeRepo;
         $this->view->repos    = $repos;
-        $this->view->products = $this->dao->select('id, name')->from(TABLE_PRODUCT)->where('deleted')->eq(0)->fetchPairs();
+        $this->view->products = $products;
         $this->view->programs = $this->dao->select('id, name')->from(TABLE_PROGRAM)->where('deleted')->eq(0)->andWhere('type')->eq('program')->fetchPairs();
+
         $this->display();
     }
 
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index d863d4163a..e03b984f6e 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -4758,32 +4758,7 @@ class upgradeModel extends model
             ->join('products', ',')
             ->get();
 
-        foreach($data->repos as $repoID)
-        {
-            /* If have no products, add it. */
-            if(isset($data->name))
-            {
-                $product = new stdclass();
-                $product->program        = $data->program;
-                $product->name           = $data->name;
-                $product->acl            = 'open';
-                $product->PO             = isset($this->app->user->account) ? $this->app->user->account : '';
-                $product->createdBy      = isset($this->app->user->account) ? $this->app->user->account : '';
-                $product->createdDate    = helper::now();
-                $product->status         = 'normal';
-                $product->createdVersion = $this->config->version;
-
-                $this->dao->insert(TABLE_PRODUCT)->data($product)->exec();
-                $productID = $this->dao->lastInsertID();
-                $this->loadModel('action')->create('product', $productID, 'openedbysystem');
-
-                $this->dao->update(TABLE_REPO)->set('product')->eq($productID)->where('id')->eq($repoID)->exec();
-            }
-            else
-            {
-                $this->dao->update(TABLE_REPO)->set('product')->eq($data->products)->where('id')->eq($repoID)->exec();
-            }
-        }
+        foreach($data->repos as $repoID) $this->dao->update(TABLE_REPO)->set('product')->eq($data->products)->where('id')->eq($repoID)->exec();
     }
 
     /**
diff --git a/module/upgrade/view/mergerepo.html.php b/module/upgrade/view/mergerepo.html.php
index 9387ecbbbe..2c65476e72 100644
--- a/module/upgrade/view/mergerepo.html.php
+++ b/module/upgrade/view/mergerepo.html.php
@@ -38,21 +38,10 @@
           <div class='table-col pgmWidth' id='programBox'>
             <div class='cell'>
               <table class='table table-form'>
-                <?php if($products):?>
                 <tr>
                   <th class='w-70px'><?php echo $lang->upgrade->product;?></th>
                   <td><?php echo html::select("products[]", $products, '', "class='form-control chosen' multiple");?></td>
                 </tr>
-                <?php else:?>
-                <tr>
-                  <th class='w-100px'><?php echo $lang->upgrade->existProgram;?></th>
-                  <td><?php echo html::select("program", $programs, '', "class='form-control chosen'");?></td>
-                </tr>
-                <tr>
-                  <th><?php echo $lang->upgrade->product;?></th>
-                  <td><?php echo html::input("name", '', "class='form-control'");?></td>
-                </tr>
-                <?php endif;?>
                 <tr>
                   <td colspan='2' class='text-center form-actions'><?php echo html::submitButton();?></td>
                 </tr>