#600 change '' to '' and '' to '' ---> CoursesAdminController && Perm…

…issionsController
hacklabr · Jun 20, 2016 · 8274455 · 8274455
1 parent 14d75b1
commit 8274455
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -59,6 +59,7 @@ settings_local.py
 /.cache
 /node_modules
 bower_components/
+/tim
 
 # Vagrant
 .vagrant

diff --git a/administration/static/js/course-permissions/controllers.js b/administration/static/js/course-permissions/controllers.js
@@ -1,8 +1,8 @@
 (function(angular){
 
     angular.module('course-permissions.controllers', []).
-        controller('PermissionsController', ['$scope', '$window', '$modal', '$http', '$q', 'Course',  'CourseProfessor',
-        function($scope, $window, $modal, $http, $q, Course, CourseProfessor) {
+        controller('PermissionsController', ['$scope', '$window', '$uibModal', '$http', '$q', 'Course',  'CourseProfessor',
+        function($scope, $window, $uibModal, $http, $q, Course, CourseProfessor) {
 
             var success_save_msg = 'Alterações salvas com sucesso.';
             var error_save_msg = 'Não foi possível salvar todas as alterações.';
@@ -66,7 +66,7 @@
             };
 
             $scope.new_professors = function () {
-                var modalInstance = $modal.open({
+                var modalInstance = $uibModal.open({
                     templateUrl: 'newProfessorModal.html',
                     controller: ['$scope', '$uibmodalInstance', 'course_id', addProfessorsModalInstanceCtrl],
                     resolve: {

diff --git a/administration/static/js/courses/controllers.js b/administration/static/js/courses/controllers.js
@@ -4,8 +4,8 @@
     var app = angular.module('courses');
 
     app.controller('CoursesAdminController', [
-        '$scope', '$modal', '$window', 'Course', 'Lesson', 'FormUpload',
-        function ($scope, $modal, $window, Course, Lesson, FormUpload) {
+        '$scope', '$uibModal', '$window', 'Course', 'Lesson', 'FormUpload',
+        function ($scope, $uibModal, $window, Course, Lesson, FormUpload) {
 
             $scope.courseList = [];
             $scope.ordering = 'start_date';
@@ -80,21 +80,21 @@
             }
 
             $scope.import_course_modal = function () {
-                var modalInstance = $modal.open({
+                var modalInstance = $uibModal.open({
                     templateUrl: 'import_course_modal.html',
-                    controller: ['$scope', '$modalInstance', ImportCourseModalInstanceCtrl]
+                    controller: ['$scope', '$uibModalInstance', ImportCourseModalInstanceCtrl]
                 });
                 modalInstance.result.then(function (course_import_file) {
                     send_course_file(course_import_file);
                 });
             };
-            var ImportCourseModalInstanceCtrl = function ($scope, $modalInstance) {
+            var ImportCourseModalInstanceCtrl = function ($scope, $uibModalInstance) {
                 $scope.cancel = function () {
-                    $modalInstance.dismiss();
+                    $uibModalInstance.dismiss();
                 };
 
                 $scope.import_course = function () {
-                    $modalInstance.close($scope.course_import_file);
+                    $uibModalInstance.close($scope.course_import_file);
 
                 };
             };
@@ -106,8 +106,8 @@
      *
     **/
     app.controller('CourseListByUserRoleController', [
-        '$scope', '$window', '$modal', 'Lesson', 'CourseProfessor', 'Class',
-        function ($scope, $window, $modal, Lesson, CourseProfessor, Class) {
+        '$scope', '$window', '$uibModal', 'Lesson', 'CourseProfessor', 'Class',
+        function ($scope, $window, $uibModal, Lesson, CourseProfessor, Class) {
             var current_user_id = parseInt($window.user_id, 10);
 
             $scope.loadLessons = function(course) {
@@ -126,7 +126,7 @@
                           'role': 'coordinator'});
 
             $scope.open_professor_modal = function(course_professor) {
-                var modalInstance = $modal.open({
+                var modalInstance = $uibModal.open({
                        templateUrl: 'create_class_modal.html',
                        controller: CreateClassModalInstanceCtrl,
                        resolve: {
@@ -139,11 +139,11 @@
                 });
             };
 
-            var CreateClassModalInstanceCtrl = function($scope, $modalInstance, course_professor) {
+            var CreateClassModalInstanceCtrl = function($scope, $uibModalInstance, course_professor) {
                 $scope.course = course_professor.course;
 
                 $scope.cancel = function () {
-                    $modalInstance.dismiss();
+                    $uibModalInstance.dismiss();
                 };
             };
         }