[Fmsystem-commits] [15546] rental: more on application

[sigurdne]

Revision: 15546
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15546
Author:   sigurdne
Date:     2016-08-30 14:11:06 +0000 (Tue, 30 Aug 2016)
Log Message:
-----------
rental: more on application

Modified Paths:
--------------
    trunk/rental/inc/class.uiapplication.inc.php
    trunk/rental/inc/model/class.application.inc.php

Modified: trunk/rental/inc/class.uiapplication.inc.php
===================================================================
--- trunk/rental/inc/class.uiapplication.inc.php        2016-08-30 14:05:26 UTC 
(rev 15545)
+++ trunk/rental/inc/class.uiapplication.inc.php        2016-08-30 14:11:06 UTC 
(rev 15546)
@@ -257,7 +257,6 @@
                                else
                                {
                                        $application = new rental_application();
-                                       $application->status = 
rental_application::STATUS_REGISTERED;
                                }
                        }
 
@@ -401,7 +400,6 @@
                        else
                        {
                                $application = new rental_application();
-                               $application->status = 
$application::STATUS_REGISTERED;
                        }
                        /*
                         * Overrides with incoming data from POST

Modified: trunk/rental/inc/model/class.application.inc.php
===================================================================
--- trunk/rental/inc/model/class.application.inc.php    2016-08-30 14:05:26 UTC 
(rev 15545)
+++ trunk/rental/inc/model/class.application.inc.php    2016-08-30 14:11:06 UTC 
(rev 15546)
@@ -235,6 +235,11 @@
                                        'type' => 'comment'
                                );
                        }
+
+                       if(!$entity-get_id())
+                       {
+                               $entity->status = 
rental_application::STATUS_REGISTERED;
+                       }
                }
 
                public function serialize()