Merge pull request #32 from appirio-tech/dev

Dev

Author: ajefts

src/app/users/users.controller.js

@@ -180,7 +180,7 @@ module.controller('users.UserSearchController', [
 ]);
 
 module.controller('users.UserEditDialogController', [
-  '$scope', '$rootScope', '$modalInstance', 'UserService', 'Alert', 'user',
+  '$scope', '$rootScope', '$uibModalInstance', 'UserService', 'Alert', 'user',
     function ($scope, $rootScope, $modalInstance, $userService, $alert, user) {
 
       $scope.user = user;
@@ -269,7 +269,7 @@ module.controller('users.UserEditDialogController', [
 ]);
 
 module.controller('users.StatusUpdateDialogController', [
-  '$scope', '$rootScope', '$modalInstance', 'UserService', 'users.Constants', 'Alert', 'user',
+  '$scope', '$rootScope', '$uibModalInstance', 'UserService', 'users.Constants', 'Alert', 'user',
     function ($scope, $rootScope, $modalInstance, $userService, $const, $alert, user) {
 
       $scope.form = {
@@ -312,7 +312,7 @@ module.controller('users.StatusUpdateDialogController', [
 ]);
 
 module.controller('users.StatusHistoryDialogController', [
-  '$scope', '$rootScope', '$modalInstance', 'UserService', 'users.Constants', 'Alert', 'user',
+  '$scope', '$rootScope', '$uibModalInstance', 'UserService', 'users.Constants', 'Alert', 'user',
     function ($scope, $rootScope, $modalInstance, $userService, $const, $alert, user) {
 
       $scope.init = function() {

src/app/users/users.html

@@ -105,11 +105,11 @@ <h2>Users</h2>
                     <a href="#" ng-show="user.active"><i class="fa fa-check text-navy"></i></a>
                   </td>
                   <td>
-                    <div class="btn-group" dropdown >
-                        <button type="button" class="btn btn-primary btn-sm dropdown-toggle" dropdown-toggle>
+                    <div class="btn-group" uib-dropdown >
+                        <button type="button" class="btn btn-primary btn-sm dropdown-toggle" uib-dropdown-toggle>
                             Edit <i class="fa fa-caret-down"></i>
                         </button>
-                        <ul class="dropdown-menu" role="menu">
+                        <ul class="dropdown-menu" uib-dropdown-menu role="menu">
                             <li><a href="" ng-click="openHandleEditDialog($index)">Handle</a></li>
                             <li><a href="" ng-click="openEmailEditDialog($index)">Primary Email</a></li>
                         </ul>

src/app/work/projects.service.js

@@ -69,7 +69,7 @@ angular.module('supportAdminApp')
               deferred.resolve(); // continue promise chain.
             })
             .catch(function (err) {
-              if (err === 'project steps not found') { // not an error, just no work steps found
+              if (err === workSvc.workStepNotFound) { // not an error, just no work steps found
                 proj.currentStep = 'N/A'; // placeholder value for projects with no work steps
                 deferred.resolve();      // continue promise chain.
               } else {

src/app/work/work.controller.js

@@ -70,7 +70,7 @@ module.controller('workController', ['$scope', '$rootScope', '$timeout', '$state
                     $scope.work = null;
                     var errorMessage = error.error;
                     if (error.status == 404) {
-                        errorMessage = 'work with id ' + $scope.workSearch.workId +
+                        errorMessage = 'project with id ' + $scope.workSearch.workId +
                         ' not found';
                     }
                     $scope.$broadcast('alert.AlertIssued', {

src/app/work/work.service.js

@@ -4,10 +4,12 @@ angular.module('supportAdminApp')
   .factory('WorkService', ['$q', '$http', 'WORK_API_URL', '$log', 'API_VERSION_PATH',
       function($q, $http, WORK_API_URL, $log, API_VERSION_PATH) {
 
+        var workStepNotFound = 'Project steps not found';
         var service = {
           getWorkSteps: getWorkSteps,
           findWorkById: findWorkById,
-          putWorkStep: putWorkStep
+          putWorkStep: putWorkStep,
+          workStepNotFound: workStepNotFound          
         };
 
         /**
@@ -114,7 +116,7 @@ angular.module('supportAdminApp')
                 return steps;
 
               } else {
-                return $q.reject("project steps not found");
+                return $q.reject(workStepNotFound);
               }
             },
             function(error) {
@@ -156,6 +158,7 @@ angular.module('supportAdminApp')
               if (response.data && response.data.result && response.data.result.content) {
                 return response.data.result.content;
               } else {
+                console.log("project with '" + workId + "' not found.");
                 return $q.reject({
                   error: "project with '" + workId + "' not found."
                 });

src/components/common/navigation.controller.js

@@ -3,6 +3,7 @@
 angular.module('supportAdminApp')
   .controller('NavController', ['$scope', '$state', 
   function ($scope, $state) {
+    $scope.$state = $state;
 
     $scope.forceStateProjects = function () {
       $state.go('index.projects');