newScene modal fix

sails/src/assets/scripts/modules/student/controllers/collections.js

@@ -598,20 +598,42 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
       templateUrl: 'modules/student/views/newscene.html',
       templateUrl: 'modules/student/views/newscene.html',
       controller: 'NewSceneCtrl',
       controller: 'NewSceneCtrl',
       size: 'md',
       size: 'md',
-      resolve: { // Passing data to NewSceneCtrl
-        sup: function () {
-          return $scope.user;
-        },
-        stu_id: function () {
-          return $scope.studentData.id;
-        },
-        newSceneName: function(){
-          return $scope.newSceneName;
-        },
-        newSceneCat: function(){
-          return $scope.newSceneCat;
-        }
-      }
+      resolve: { }
+    });
+
+    // Returned data from the modal window
+    modalInstance.result.then(function (name) {
+
+      if(!name)
+        return;
+
+        $http.post(config.backend + '/scene/stu/' + $scope.studentData.id, {
+          name: name,
+          id_sup: $scope.user.id,
+          categories: $scope.newSceneCat,
+          id_stu: $scope.studentData.id
+        })
+        .success(function (scene) {
+          var data =  {
+            name: scene.name,
+            active: scene.active,
+            categories: scene.categories,
+            student: scene.student,
+            supervisor: scene.supervisor
+          };
+
+          io.socket.post('/scene', {
+            action: 'add',
+            scene: data
+          }, function () {});
+
+          $translate('scene_added').then(function (translation) {
+            ngToast.success({ content: translation });
+          });
+
+          $scope.loadScenesList();
+
+        }).error(function () {});
     });
     });
 
 
   };
   };

sails/src/assets/scripts/modules/student/controllers/newscene.js

@@ -11,54 +11,13 @@ dashboardControllers.controller('NewSceneCtrl', function (
   $http,
   $http,
   config,
   config,
   $translate,
   $translate,
-  ngToast,
-  sup,
-  stu_id,
-  newSceneName,
-  newSceneCat
+  ngToast
 ) {
 ) {
 
 
-  $scope.sup = sup;
-  $scope.stu_id = stu_id;
-  $scope.newSceneName = newSceneName;
-  $scope.newSceneCat = newSceneCat;
 
 
 
 
-  // Create a new student scene
-  $scope.new_scene = function () {
-
-      $http.post(config.backend + '/scene/stu/' + $scope.stu_id, {
-        name: $scope.newSceneName,
-        id_sup: $scope.sup.id,
-        categories: $scope.newSceneCat,
-        id_stu: $scope.stu_id
-      })
-      .success(function (scene) {
-        var data =  {
-          name: scene.name,
-          active: scene.active,
-          categories: scene.categories,
-          student: scene.student,
-          supervisor: scene.supervisor
-        };
-
-        io.socket.post('/scene', {
-          action: 'add',
-          scene: data
-        }, function () {});
-
-        $translate('scene_added').then(function (translation) {
-          ngToast.success({ content: translation });
-        });
-        
-        location.reload();
-
-      }).error(function () {});
-
-  };
-
-  $scope.close = function () {
-    $modalInstance.close('Ejemplo de elemento devuelto');
+  $scope.close = function (name) {
+    $modalInstance.close(name);
   };
   };
 
 
   $scope.cancel = function () {
   $scope.cancel = function () {

sails/src/assets/scripts/modules/student/views/newscene.html

@@ -7,10 +7,10 @@
     </div>
     </div>
     <div class="modal-body">
     <div class="modal-body">
 
 
-      <form ng-submit="new_scene()">
+      <form ng-submit="close(name)">
         <div id="add_label" class="input-group">
         <div id="add_label" class="input-group">
           <span class="input-group-addon"><span class="glyphicon glyphicon-comment" aria-hidden="true"></span></span>
           <span class="input-group-addon"><span class="glyphicon glyphicon-comment" aria-hidden="true"></span></span>
-          <input type="text" class="form-control" ng-model="newSceneName" autofocus/>
+          <input type="text" class="form-control" ng-model="name" autofocus/>
            <span class="input-group-btn">
            <span class="input-group-btn">
             <button class="btn btn-success" type="submit" translate>create</button>
             <button class="btn btn-success" type="submit" translate>create</button>
           </span>
           </span>