Indefero Commit Details

Date:

2012-01-03 10:09:41 (13 years 3 months ago)

Author:

Thomas Keller

Branch:

develop, release-1.3

Commit:

126f94016f41d6960370ecad44d22e76897f68ce

Parents:

6bbabaebdd058c413d671e15dd10f1c4b66ba023

Message:

Do not accidentially delete the logo if we update the project conf.

Changes:

File differences

-193
194 194
195 195
196 
197 
198 
199 
200 
201 
202 
203 
204 
205 
196
197
198
199
200
201
202
203
206 204
207 205
208 206
+        $this->project->update();␊
␊
        $conf = $this->project->getConf();␊
        $keys = array('logo', 'external_project_url');␊
        foreach ($keys as $key) {␊
            if (array_key_exists($key, $this->cleaned_data)) {␊
                if (!empty($this->cleaned_data[$key])) {␊
                    $conf->setVal($key, $this->cleaned_data[$key]);␊
                }␊
                else {␊
                    $conf->delVal($key);␊
                }␊
            }␊
        if (!empty($this->cleaned_data['logo'])) {␊
            $conf->setVal('logo', $this->cleaned_data['logo']);␊
        }␊
        if (!empty($this->cleaned_data['external_project_url'])) {␊
            $conf->setVal('external_project_url', $this->cleaned_data['external_project_url']);␊
        }␊
        else {␊
            $conf->delVal('external_project_url');␊
        }␊
␊
        if ($this->cleaned_data['logo_remove'] === true) {␊
         $this->project->update();␊
 ␊
         $conf = $this->project->getConf();␊
-        $keys = array('logo', 'external_project_url');␊
-        foreach ($keys as $key) {␊
-            if (array_key_exists($key, $this->cleaned_data)) {␊
-                if (!empty($this->cleaned_data[$key])) {␊
-                    $conf->setVal($key, $this->cleaned_data[$key]);␊
-                }␊
-                else {␊
-                    $conf->delVal($key);␊
-                }␊
-            }␊
+        if (!empty($this->cleaned_data['logo'])) {␊
+            $conf->setVal('logo', $this->cleaned_data['logo']);␊
+        }␊
+        if (!empty($this->cleaned_data['external_project_url'])) {␊
+            $conf->setVal('external_project_url', $this->cleaned_data['external_project_url']);␊
+        }␊
+        else {␊
+            $conf->delVal('external_project_url');␊
         }␊
 ␊
         if ($this->cleaned_data['logo_remove'] === true) {␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags