Merge pull request #156 from TAMULib/authentication-fix

fix scope for various login, upgrade weaver

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cap",
   "private": true,
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "Fedora User Interface",
   "repository": "https://github.com/TAMULib/Cap",
   "license": "MIT",
@@ -21,12 +21,12 @@
     "start-dev": "wvr server -b /cap --uid cap-webserver"
   },
   "dependencies": {
+    "@wvr/core": "2.0.8",
     "ng-csv": "0.3.6",
     "ng-file-upload": "12.2.13",
     "ng-openseadragon": "1.3.5",
     "ng-table": "3.0.1",
-    "openseadragon": "2.4.0",
-    "@wvr/core": "2.0.7"
+    "openseadragon": "2.4.0"
   },
   "devDependencies": {
     "grunt": "1.0.3",

pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>edu.tamu</groupId>
   <artifactId>cap</artifactId>
-  <version>0.6.1</version>
+  <version>0.6.2</version>
   <packaging>war</packaging>
 
   <name>Cap</name>
@@ -15,7 +15,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
   </parent>
 
   <properties>
@@ -32,37 +32,37 @@
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>auth</artifactId>
-      <version>2.0.2</version>
+      <version>2.0.3</version>
     </dependency>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>token-provider</artifactId>
-      <version>2.0.2</version>
+      <version>2.0.3</version>
     </dependency>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>validation</artifactId>
-      <version>2.0.2</version>
+      <version>2.0.3</version>
     </dependency>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>wro</artifactId>
-      <version>2.0.2</version>
+      <version>2.0.3</version>
     </dependency>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>reporting</artifactId>
-      <version>2.0.2</version>
+      <version>2.0.3</version>
     </dependency>
 
     <dependency>
       <groupId>edu.tamu.weaver</groupId>
       <artifactId>messaging</artifactId>
-      <version>2.0.2</version>
+      <version>2.0.3</version>
     </dependency>
 
     <dependency>

src/main/webapp/app/controllers/appLoginController.js

@@ -1,6 +1,6 @@
 cap.controller('AppLoginController', function ($controller, $scope) {
 
-  angular.extend(this, $controller('AuthenticationController', {
+  angular.extend(this, $controller('LoginController', {
     $scope: $scope
   }));
 

src/main/webapp/app/views/modals/loginModal.html

@@ -1,4 +1,4 @@
-<div ng-controller="AppLoginController">
+<div>
   <div class="modal-header {{attr.modalHeaderClass}}">
     <button type="button" class="close" ng-click="reset()" aria-label="Close">
       <span class="modal-close" aria-hidden="true">&times;</span>
@@ -7,7 +7,7 @@ <h3 class="modal-title">Login</h3>
   </div>
 
   <form name="forms.login" novalidate>
-    <span ng-if="isEmailEnabled()">
+    <span ng-if="isEmailEnabled()" ng-controller="AppLoginController">
       <validationmessage results="user.getValidationResults()"></validationmessage>
       <div class="modal-body loginModal">
         <validatedinput model="account" property="email" label="Email" placeholder="Enter email" form="forms.login" validations="user.getValidations()" results="user.getValidationResults()"></validatedinput>
@@ -17,7 +17,7 @@ <h3 class="modal-title">Login</h3>
         <button class="btn btn-primary" type="submit" ng-click="login()" ng-disabled="forms.login.$invalid">Login</button>
       </div>
     </span>
-    <div class="modal-footer">
+    <div class="modal-footer" ng-controller="AuthenticationController">
       <button type="button" class="btn btn-default" ng-click="reset()">Cancel</button>
       <button ng-if="isExternalEnabled()" type="button" class="btn btn-primary pull-left" ng-click="login()">External Login</button>
     </div>