Merge pull request #1 from fguillot/master

1 files changed, 8 insertions, 11 deletions

diff --git a/app/Model/UserNotification.php b/app/Model/UserNotification.php
index e8a967ac..7795da2e 100644
--- a/app/Model/UserNotification.php
+++ b/app/Model/UserNotification.php
@@ -117,23 +117,20 @@ class UserNotification extends Base
      */
     public function saveSettings($user_id, array $values)
     {
-        $this->db->startTransaction();
+        $types = empty($values['notification_types']) ? array() : array_keys($values['notification_types']);
 
-        if (isset($values['notifications_enabled']) && $values['notifications_enabled'] == 1) {
+        if (! empty($types)) {
             $this->enableNotification($user_id);
-
-            $filter = empty($values['notifications_filter']) ? UserNotificationFilter::FILTER_BOTH : $values['notifications_filter'];
-            $projects = empty($values['notification_projects']) ? array() : array_keys($values['notification_projects']);
-            $types = empty($values['notification_types']) ? array() : array_keys($values['notification_types']);
-
-            $this->userNotificationFilter->saveFilter($user_id, $filter);
-            $this->userNotificationFilter->saveSelectedProjects($user_id, $projects);
-            $this->userNotificationType->saveSelectedTypes($user_id, $types);
         } else {
             $this->disableNotification($user_id);
         }
 
-        $this->db->closeTransaction();
+        $filter = empty($values['notifications_filter']) ? UserNotificationFilter::FILTER_BOTH : $values['notifications_filter'];
+        $project_ids = empty($values['notification_projects']) ? array() : array_keys($values['notification_projects']);
+
+        $this->userNotificationFilter->saveFilter($user_id, $filter);
+        $this->userNotificationFilter->saveSelectedProjects($user_id, $project_ids);
+        $this->userNotificationType->saveSelectedTypes($user_id, $types);
     }
 
     /**