Merge pull request #1 from RallyTechServices/master

krmorse · web-flow · commit e00bf5e1f152 · 2018-03-29T10:51:45.000-06:00
Fixed spelling of 'because'.
diff --git a/bulk-user-update-app/deploy/App.txt b/bulk-user-update-app/deploy/App.txt
@@ -138,7 +138,7 @@ Ext.define('CA.technicalservices.userutilities.bulkmenu.AssignPermissions', {
                 });
             } else {
                 if (ineligibleUsers){
-                    message = message + ".<br/><br/>" + ineligibleUsers + " user(s) were not updated becuase they were either disabled, Subscription Administrators or Workspace Administrators";
+                    message = message + ".<br/><br/>" + ineligibleUsers + " user(s) were not updated because they were either disabled, Subscription Administrators or Workspace Administrators";
                 }
 
                 if (unsuccessfulRecords.length > 0){
@@ -259,7 +259,7 @@ Ext.define('CA.technicalservices.userutilities.bulkmenu.RemovePermissions', {
                 });
             } else {
                 if (ineligibleUsers){
-                    message = message + ".<br/><br/>" + ineligibleUsers + " user(s) were not updated becuase they were either disabled, Subscription Administrators or Workspace Administrators";
+                    message = message + ".<br/><br/>" + ineligibleUsers + " user(s) were not updated because they were either disabled, Subscription Administrators or Workspace Administrators";
                 }
 
                 if (unsuccessfulRecords.length > 0){
@@ -379,7 +379,7 @@ Ext.define('CA.technicalservices.userutilities.bulkmenu.TeamMembership', {
                 });
             } else {
                 if (ineligibleUsers){
-                    message = message + ".<br/><br/>" + ineligibleUsers + " user(s) were not updated becuase they were either disabled, Subscription Administrators or Workspace Administrators";
+                    message = message + ".<br/><br/>" + ineligibleUsers + " user(s) were not updated because they were either disabled, Subscription Administrators or Workspace Administrators";
                 }
 
                 if (unsuccessfulRecords.length > 0){
@@ -3488,4 +3488,4 @@ Ext.define("bulk-user-update-app", {
 
 </head>
 <body></body>
-</html>
+</html>
diff --git a/bulk-user-update-app/src/javascript/utils/BulkMenuAssignPermissions.js b/bulk-user-update-app/src/javascript/utils/BulkMenuAssignPermissions.js
@@ -120,7 +120,7 @@ Ext.define('CA.technicalservices.userutilities.bulkmenu.AssignPermissions', {
                 });
             } else {
                 if (ineligibleUsers){
-                    message = message + ".<br/><br/>" + ineligibleUsers + " user(s) were not updated becuase they were either disabled, Subscription Administrators or Workspace Administrators";
+                    message = message + ".<br/><br/>" + ineligibleUsers + " user(s) were not updated because they were either disabled, Subscription Administrators or Workspace Administrators";
                 }
 
                 if (unsuccessfulRecords.length > 0){
@@ -140,4 +140,4 @@ Ext.define('CA.technicalservices.userutilities.bulkmenu.AssignPermissions', {
             Ext.callback(this.onActionComplete, null, [successfulRecords, unsuccessfulRecords]);
         }
     }
-});
+});
diff --git a/bulk-user-update-app/src/javascript/utils/BulkMenuRemovePermissions.js b/bulk-user-update-app/src/javascript/utils/BulkMenuRemovePermissions.js
@@ -98,7 +98,7 @@ Ext.define('CA.technicalservices.userutilities.bulkmenu.RemovePermissions', {
                 });
             } else {
                 if (ineligibleUsers){
-                    message = message + ".<br/><br/>" + ineligibleUsers + " user(s) were not updated becuase they were either disabled, Subscription Administrators or Workspace Administrators";
+                    message = message + ".<br/><br/>" + ineligibleUsers + " user(s) were not updated because they were either disabled, Subscription Administrators or Workspace Administrators";
                 }
 
                 if (unsuccessfulRecords.length > 0){
@@ -118,4 +118,4 @@ Ext.define('CA.technicalservices.userutilities.bulkmenu.RemovePermissions', {
             Ext.callback(this.onActionComplete, null, [successfulRecords, unsuccessfulRecords]);
         }
     }
-});
+});
diff --git a/bulk-user-update-app/src/javascript/utils/BulkMenuTeamMembership.js b/bulk-user-update-app/src/javascript/utils/BulkMenuTeamMembership.js
@@ -97,7 +97,7 @@ Ext.define('CA.technicalservices.userutilities.bulkmenu.TeamMembership', {
                 });
             } else {
                 if (ineligibleUsers){
-                    message = message + ".<br/><br/>" + ineligibleUsers + " user(s) were not updated becuase they were either disabled, Subscription Administrators or Workspace Administrators";
+                    message = message + ".<br/><br/>" + ineligibleUsers + " user(s) were not updated because they were either disabled, Subscription Administrators or Workspace Administrators";
                 }
 
                 if (unsuccessfulRecords.length > 0){
@@ -117,4 +117,4 @@ Ext.define('CA.technicalservices.userutilities.bulkmenu.TeamMembership', {
             Ext.callback(this.onActionComplete, null, [successfulRecords, unsuccessfulRecords]);
         }
     }
-});
+});

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ Ext.define('CA.technicalservices.userutilities.bulkmenu.AssignPermissions', {`
`120`	`120`	`});`
`121`	`121`	`} else {`
`122`	`122`	`if (ineligibleUsers){`
`123`		`- message = message + ".<br/><br/>" + ineligibleUsers + " user(s) were not updated becuase they were either disabled, Subscription Administrators or Workspace Administrators";`
	`123`	`+ message = message + ".<br/><br/>" + ineligibleUsers + " user(s) were not updated because they were either disabled, Subscription Administrators or Workspace Administrators";`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`if (unsuccessfulRecords.length > 0){`
`@@ -140,4 +140,4 @@ Ext.define('CA.technicalservices.userutilities.bulkmenu.AssignPermissions', {`
`140`	`140`	`Ext.callback(this.onActionComplete, null, [successfulRecords, unsuccessfulRecords]);`
`141`	`141`	`}`
`142`	`142`	`}`
`143`		`-});`
	`143`	`+});`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ Ext.define('CA.technicalservices.userutilities.bulkmenu.RemovePermissions', {`
`98`	`98`	`});`
`99`	`99`	`} else {`
`100`	`100`	`if (ineligibleUsers){`
`101`		`- message = message + ".<br/><br/>" + ineligibleUsers + " user(s) were not updated becuase they were either disabled, Subscription Administrators or Workspace Administrators";`
	`101`	`+ message = message + ".<br/><br/>" + ineligibleUsers + " user(s) were not updated because they were either disabled, Subscription Administrators or Workspace Administrators";`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`if (unsuccessfulRecords.length > 0){`
`@@ -118,4 +118,4 @@ Ext.define('CA.technicalservices.userutilities.bulkmenu.RemovePermissions', {`
`118`	`118`	`Ext.callback(this.onActionComplete, null, [successfulRecords, unsuccessfulRecords]);`
`119`	`119`	`}`
`120`	`120`	`}`
`121`		`-});`
	`121`	`+});`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ Ext.define('CA.technicalservices.userutilities.bulkmenu.TeamMembership', {`
`97`	`97`	`});`
`98`	`98`	`} else {`
`99`	`99`	`if (ineligibleUsers){`
`100`		`- message = message + ".<br/><br/>" + ineligibleUsers + " user(s) were not updated becuase they were either disabled, Subscription Administrators or Workspace Administrators";`
	`100`	`+ message = message + ".<br/><br/>" + ineligibleUsers + " user(s) were not updated because they were either disabled, Subscription Administrators or Workspace Administrators";`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`if (unsuccessfulRecords.length > 0){`
`@@ -117,4 +117,4 @@ Ext.define('CA.technicalservices.userutilities.bulkmenu.TeamMembership', {`
`117`	`117`	`Ext.callback(this.onActionComplete, null, [successfulRecords, unsuccessfulRecords]);`
`118`	`118`	`}`
`119`	`119`	`}`
`120`		`-});`
	`120`	`+});`