Changeset 23428 for branches/version-2_13-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php

Timestamp:

2014/05/19 11:04:28 (10 years ago)

Author:

pineray

Message:

#2524 CSS の重複チェックができていないようです

File:

• branches/version-2_13-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php (modified) (4 diffs)

branches/version-2_13-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php

@@ -76 +76 @@
         $objFormParam->convParam();
         $this->arrErr = $objFormParam->checkError();
-        $is_error = (!SC_Utils_Ex::isBlank($this->arrErr));
+        $is_error = !SC_Utils_Ex::isBlank($this->arrErr);
 
         // CSSファイル名を取得
         $this->css_name = $objFormParam->getValue('css_name');
-        $this->old_css_name = $objFormParam->getValue('old_css_name', $this->css_name);
+        $this->old_css_name = $objFormParam->getValue('old_css_name');
         $this->device_type_id = $objFormParam->getValue('device_type_id', DEVICE_TYPE_PC);
 
@@ -90 +90 @@
             case 'confirm':
                 if (!$is_error) {
-                    $this->arrErr = $this->lfCheckError($objFormParam, $this->arrErr);
+                    $this->arrErr = array_merge($this->arrErr, $this->lfCheckError($objFormParam, $this->arrErr));
                     if (SC_Utils_Ex::isBlank($this->arrErr)) {
                         if ($this->doRegister($css_dir, $this->css_name, $this->old_css_name, $css_path,
@@ -119 +119 @@
         }
 
-        if (!$is_error && $this->checkPath($this->css_name)) {
+        if (SC_Utils_Ex::isBlank($this->arrErr) && $this->checkPath($this->css_name)) {
             // CSSファイルの読み込み
             if (!SC_Utils_Ex::isBlank($this->css_name)) {
@@ -234 +234 @@
 
         $css_name = $objFormParam->getValue('css_name');
-        $old_css_name = $objFormParam->getValue('old_css_name', $css_name);
+        $old_css_name = $objFormParam->getValue('old_css_name');
+        $device_type_id = $objFormParam->getValue('device_type_id', DEVICE_TYPE_PC);
 
         $is_error = false;
         // 重複チェック
-        if (!SC_Utils_Ex::isBlank(($objErr->arrErr['css_name']))) {
-            $arrCSSList = $this->getCSSList($this->getCSSDir());
+        if (SC_Utils_Ex::isBlank($objErr->arrErr['css_name'])) {
+            $arrCSSList = $this->getCSSList($this->getCSSDir($device_type_id));
             foreach ($arrCSSList as $val) {
                 if ($val['css_name'] == $css_name) {