From 1818e3eef1ceeb5c98dcbb2450345f5df4ba5ba7 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Fri, 28 Aug 2020 13:34:17 +0800
Subject: [PATCH] * Rename design get pairs method and add required fields
 config.

---
 module/design/config.php |  5 ++++
 module/design/model.php  | 59 +++++++++++++++++++++-------------------
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/module/design/config.php b/module/design/config.php
index 34de9d4a8c..92ff3e5832 100644
--- a/module/design/config.php
+++ b/module/design/config.php
@@ -5,6 +5,11 @@ $config->design->editor->create   = array('id' => 'desc',    'tools' => 'simpleT
 $config->design->editor->edit     = array('id' => 'desc',    'tools' => 'simpleTools');
 $config->design->editor->assignto = array('id' => 'comment', 'tools' => 'simpleTools');
 
+$config->design->create = new stdclass();
+$config->design->edit   = new stdclass();
+$config->design->create->requiredFields = 'name,type';
+$config->design->edit->requiredFields   = 'name,type';
+
 $config->design->affectedFixedNum = 7; 
 
 global $lang;
diff --git a/module/design/model.php b/module/design/model.php
index 41168142ce..b84f121786 100644
--- a/module/design/model.php
+++ b/module/design/model.php
@@ -27,11 +27,14 @@ class designModel extends model
             ->add('createdDate', helper::now())
             ->add('program', $this->session->program)
             ->add('version', 1)
-            ->remove('file,files,labels,children,toList')
+            ->remove('files,labels')
             ->get();
 
         $design = $this->loadModel('file')->processImgURL($design, 'desc', $this->post->uid);
-        $this->dao->insert(TABLE_DESIGN)->data($design)->autoCheck()->batchCheck('name,type', 'notempty')->exec();
+        $this->dao->insert(TABLE_DESIGN)->data($design)
+            ->autoCheck()
+            ->batchCheck($this->config->design->create->requiredFields, 'notempty')
+            ->exec();
 
         if(!dao::isError())
         {
@@ -134,6 +137,31 @@ class designModel extends model
         return false;
     }
 
+    /**
+     * Assign a design.
+     *
+     * @param  int    $designID
+     * @access public
+     * @return array|bool
+     */
+    public function assign($designID = 0)
+    {
+        $oldDesign = $this->getByID($designID);
+
+        $design = fixer::input('post')
+            ->add('editedBy', $this->app->user->account)
+            ->add('editedDate', helper::today())
+            ->setDefault('assignedDate', helper::today())
+            ->stripTags($this->config->design->editor->assignto['id'], $this->config->allowedTags)
+            ->remove('uid,comment,files,label')
+            ->get();
+
+        $this->dao->update(TABLE_DESIGN)->data($design)->autoCheck()->where('id')->eq((int)$designID)->exec();
+
+        if(!dao::isError()) return common::createChanges($oldDesign, $design);
+        return false;
+    }
+
     /**
      * LinkCommit a design.
      *
@@ -223,7 +251,7 @@ class designModel extends model
      * @access public
      * @return object
      */
-    public function getDesignPairs($productID = 0, $type = 'all')
+    public function getPairs($productID = 0, $type = 'all')
     {
         $designs = $this->dao->select('id, name')->from(TABLE_DESIGN)
             ->where('product')->eq($productID)
@@ -378,29 +406,4 @@ class designModel extends model
 
         echo !common::hasPriv('design', 'assignTo', $design) ? "<span style='padding-left: 21px' class='{$btnTextClass}'>{$assignedToText}</span>" : $assignToHtml;
     }
-
-    /**
-     * Assign a design.
-     *
-     * @param  int    $designID
-     * @access public
-     * @return array|bool
-     */
-    public function assign($designID = 0)
-    {
-        $oldDesign = $this->getByID($designID);
-
-        $design = fixer::input('post')
-            ->add('editedBy', $this->app->user->account)
-            ->add('editedDate', helper::today())
-            ->setDefault('assignedDate', helper::today())
-            ->stripTags($this->config->design->editor->assignto['id'], $this->config->allowedTags)
-            ->remove('uid,comment,files,label')
-            ->get();
-
-        $this->dao->update(TABLE_DESIGN)->data($design)->autoCheck()->where('id')->eq((int)$designID)->exec();
-
-        if(!dao::isError()) return common::createChanges($oldDesign, $design);
-        return false;
-    }
 }