Changeset 9947

Timestamp:

Jan 6, 2009, 3:29:45 PM (14 years ago)

Author:

ebihara

Message:

#3341:fixed NaviForm? allows an empty navi item

Location:

OpenPNE3/trunk

Files:

• config/schema.yml (modified) (1 diff)
• lib/model/Navi.php (modified) (1 diff)

OpenPNE3/trunk/config/schema.yml

@@ -126 +126 @@
     id: ~
     type: { type: varchar(64), required: true, index: true }
-    uri: { type: longvarchar }
+    uri: { type: longvarchar, required: true }
     sort_order: { type: integer }
 
   navi_i18n:
-    caption: { type: longvarchar }
+    caption: { type: longvarchar, required: true }

OpenPNE3/trunk/lib/model/Navi.php

@@ -10 +10 @@
 class Navi extends BaseNavi
 {
+  public function save(PropelPDO $con = null)
+  {
+    if (!$this->getSortOrder())
+    {
+      $maxSortOrder = 0;
+
+      $navis = NaviPeer::retrieveByType($this->getType());
+      $finalNavi = array_pop($navis);
+      if ($finalNavi)
+      {
+        $maxSortOrder = $finalNavi->getSortOrder();
+      }
+
+      $this->setSortOrder($maxSortOrder + 10);
+    }
+
+    return parent::save($con);
+  }
 }