Merge remote-tracking branch 'origin/master'

jitterbox · Nov 28, 2014 · 7f5510d · 7f5510d
2 parents 775040b + cc1ba36
commit 7f5510d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 20 deletions.
diff --git a/FSDTS/Common/CustomValidators.cs b/FSDTS/Common/CustomValidators.cs
@@ -7,11 +7,11 @@ namespace FSDTS.Common
 {
     using System;
     using System.Collections.Generic;
+    using System.Collections.Specialized;
     using System.ComponentModel.DataAnnotations;
+    using System.Configuration;
     using System.Linq;
     using System.Web;
-    using System.Configuration;
-    using System.Collections.Specialized;
     using FSDTS.Models;
 
     /// <summary>
@@ -79,6 +79,12 @@ protected override ValidationResult IsValid(object value, ValidationContext vali
         /// </summary>
         public class UniqueAttribute : ValidationAttribute
         {
+            /// <summary>
+            /// IsValid method of UniqueAttribute class.
+            /// </summary>
+            /// <param name="value">object value</param>
+            /// <param name="validationContext">ValidationContext validationContext</param>
+            /// <returns>ValidationResult success or failure.</returns>
             protected override ValidationResult IsValid(object value, ValidationContext validationContext)
             {
                 FSDTSContext fsdtsContext = new FSDTSContext();
@@ -113,8 +119,17 @@ protected override ValidationResult IsValid(object value, ValidationContext vali
             }
         }
 
+        /// <summary>
+        /// Class to validate password complexity.
+        /// </summary>
         public class ValidatePasswordAttribute : ValidationAttribute
         {
+            /// <summary>
+            /// IsValid method of ValidatePasswordAttribute class.
+            /// </summary>
+            /// <param name="value">object value</param>
+            /// <param name="validationContext">ValidationContext validationContext</param>
+            /// <returns>ValidationResult success or failure.</returns>
              protected override ValidationResult IsValid(object value, ValidationContext validationContext)
             {
                 string password = value.ToString();

diff --git a/FSDTS/Controllers/UserController.cs b/FSDTS/Controllers/UserController.cs
@@ -107,12 +107,7 @@ public List<User> GetUserInfoByUserType(string UType)
 
             if (UType != null)
             {
-                reader = cmd.ExecuteReader();
-            }
-            else
-            {
-                throw new NullReferenceException("User Type you have entered is not correct.");
-            }
+            reader = cmd.ExecuteReader();
             while (reader.Read())
             {
                 objuser = new User();
@@ -380,6 +375,7 @@ public HttpResponseMessage PatchUser(int id, Delta<User> user)
         /// <returns>IHttpActionResult with StatusCode</returns>
         //// POST api/User
         [ResponseType(typeof(User))]
+        [HttpPost]
         [FsdtsExceptionHandler]
         [HttpPost]
         public IHttpActionResult PostUser(User user)
@@ -457,7 +453,6 @@ private bool UserExists(int id)
         /// <param name="userName">string userName</param>
         /// <param name="userPassword">string userPassword</param>
         /// <returns>HttpResponseMessage Success/Failure</returns>
-
         [ResponseType(typeof(User))]
         [FsdtsExceptionHandler]
         [Route("Api/Login")]

diff --git a/FSDTSUI/app/app.js b/FSDTSUI/app/app.js
@@ -28,7 +28,7 @@ function ($routeProvider, $locationProvider, appConstants) {
             breadcrumb: {
                 label: 'Course'
             },
-            authorizedRoles: []
+            authorizedRoles: [appConstants.USER_ROLES.ADMIN, appConstants.USER_ROLES.USER]
         }
     }).
     when('/credential/:actionType', {
@@ -38,7 +38,7 @@ function ($routeProvider, $locationProvider, appConstants) {
             breadcrumb: {
                 label: 'Credential'
             },
-            authorizedRoles: []
+            authorizedRoles: [appConstants.USER_ROLES.ADMIN, appConstants.USER_ROLES.USER]
         }
     }).
     when('/program/:actionType', {
@@ -58,7 +58,7 @@ function ($routeProvider, $locationProvider, appConstants) {
             breadcrumb: {
                 label: 'Organization'
             },
-            authorizedRoles: []
+            authorizedRoles: [appConstants.USER_ROLES.ADMIN, appConstants.USER_ROLES.USER]
         }
     }).
     when('/courseManagement', {
@@ -78,7 +78,7 @@ function ($routeProvider, $locationProvider, appConstants) {
             breadcrumb: {
                 label: 'Credentials'
             },
-            authorizedRoles: []
+            authorizedRoles: [appConstants.USER_ROLES.ADMIN, appConstants.USER_ROLES.USER]
         }
     }).
     when('/programManagement', {
@@ -131,7 +131,7 @@ function ($routeProvider, $locationProvider, appConstants) {
             breadcrumb: {
                 label: 'User'
             },
-            authorizedRoles: []
+            authorizedRoles: [appConstants.USER_ROLES.ADMIN, appConstants.USER_ROLES.USER]
         }
     }).
     when('/project/:actionType', {
@@ -153,7 +153,7 @@ function ($routeProvider, $locationProvider, appConstants) {
             breadcrumb: {
                 label: 'Reporting Periods'
             },
-            authorizedRoles: []
+            authorizedRoles: [appConstants.USER_ROLES.ADMIN, appConstants.USER_ROLES.USER]
         }
     }).
     when('/participantManagement', {
@@ -163,7 +163,7 @@ function ($routeProvider, $locationProvider, appConstants) {
             breadcrumb: {
                 label: 'Participants'
             },
-            authorizedRoles: []
+            authorizedRoles: [appConstants.USER_ROLES.ADMIN, appConstants.USER_ROLES.USER]
         }
     }).
     when('/measureManagement', {
@@ -172,7 +172,7 @@ function ($routeProvider, $locationProvider, appConstants) {
         activePage: 'Measure Management',
         label: 'Measure Management',
         data: {
-            authorizedRoles: []
+            authorizedRoles: [appConstants.USER_ROLES.ADMIN, appConstants.USER_ROLES.USER]
         }
     }).
     when('/reportManagement', {
@@ -181,7 +181,7 @@ function ($routeProvider, $locationProvider, appConstants) {
         activePage: 'Report Management',
         label: 'Report Management',
         data: {
-            authorizedRoles: []
+            authorizedRoles: [appConstants.USER_ROLES.ADMIN, appConstants.USER_ROLES.USER]
         }
     }).
     when('/measure/:actionType', {
@@ -190,7 +190,7 @@ function ($routeProvider, $locationProvider, appConstants) {
         activePage: 'Measure',
         label: 'Measure',
         data: {
-            authorizedRoles: []
+            authorizedRoles: [appConstants.USER_ROLES.ADMIN, appConstants.USER_ROLES.USER]
         }
     }).
     when('/maintenanceManagement', {
@@ -203,7 +203,7 @@ function ($routeProvider, $locationProvider, appConstants) {
                 menuType: 'parent',
                 label: 'Maintenance'
             },
-            authorizedRoles: []
+            authorizedRoles: [appConstants.USER_ROLES.ADMIN, appConstants.USER_ROLES.USER]
         }
     }).
     when('/adminUser/:userType', {