diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb15592f1..ebb23605a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@
### Improvements
-* Quepid is running on Rails 6! Rails 6 was released ~26 months, and represents the future of Rails. I'm excited that this push initiated by @DmitryKey is going to bring us some great new features like: better developer experience with Webpack for JavaScript, ActionText to handle better text formatting of notes and messages about Cases and Queries, ActionCable which will let us notify users who are rating the same case. https://github.com/o19s/quepid/pull/381 by @DmitryKey with assist from @epugh.
+* Quepid is running on Rails 6! Rails 6 was released ~26 months ago, and represents the future of Rails. I'm excited that this push initiated by @DmitryKey is going to bring us some great new features like: better developer experience with Webpack for JavaScript, ActionText to handle better text formatting of notes and messages about Cases and Queries, ActionCable which will let us notify all the users of the same case that data has changed when it changes. https://github.com/o19s/quepid/pull/381 by @DmitryKey with assist from @epugh.
* Make our ActiveRecord modeling for ownership the same. Teams have an _owner_, Scorers have an _owner_, but Cases have a _user_. Now we have _case.owner_ relationship. https://github.com/o19s/quepid/pull/359 by @epugh.
@@ -28,7 +28,7 @@
* Admin user can now reset a users password with a new password. https://github.com/o19s/quepid/pull/385 by @epugh to fix issue identified by @michaelcizmar. Thanks Michael!
-* Trying to communciate about HTTPS better when you set up a case. https://github.com/o19s/quepid/pull/384 by @epugh inspired by https://github.com/o19s/quepid/issues/279 by @arafalov.
+* Trying to communicate about HTTPS better when you set up a case. https://github.com/o19s/quepid/pull/384 by @epugh inspired by https://github.com/o19s/quepid/issues/279 by @arafalov.
diff --git a/app/assets/javascripts/controllers/scorer.js b/app/assets/javascripts/controllers/scorer.js
index b3b5da3c6..b4e0208fb 100644
--- a/app/assets/javascripts/controllers/scorer.js
+++ b/app/assets/javascripts/controllers/scorer.js
@@ -15,7 +15,7 @@ angular.module('QuepidApp')
$scope.activeScorer = parent.currentScorer || {};
$scope.cancel = cancel;
- $scope.gotoAdvanced = gotoAdvanced;
+ $scope.gotoScorers = gotoScorers;
$scope.ok = ok;
$scope.scorers = [];
$scope.communalScorers = [];
@@ -38,9 +38,9 @@ angular.module('QuepidApp')
$uibModalInstance.dismiss('cancel');
}
- function gotoAdvanced() {
+ function gotoScorers() {
$uibModalInstance.dismiss('cancel');
- $location.path('/advanced');
+ $location.path('/scorers');
}
function ok() {
diff --git a/app/assets/javascripts/controllers/advancedCtrl.js b/app/assets/javascripts/controllers/scorersCtrl.js
similarity index 68%
rename from app/assets/javascripts/controllers/advancedCtrl.js
rename to app/assets/javascripts/controllers/scorersCtrl.js
index e418204e7..bfd48227d 100644
--- a/app/assets/javascripts/controllers/advancedCtrl.js
+++ b/app/assets/javascripts/controllers/scorersCtrl.js
@@ -3,8 +3,10 @@
/*jshint camelcase: false */
/*jslint latedef:false*/
+// This controller manages the Scorers screen
+
angular.module('QuepidApp')
- .controller('AdvancedCtrl', [
+ .controller('ScorersCtrl', [
'$rootScope', '$scope',
'flash',
'broadcastSvc',
@@ -16,11 +18,11 @@ angular.module('QuepidApp')
customScorerSvc, configurationSvc
) {
// Attributes
- $scope.advanced = {};
- $scope.advanced.communalScorers = [];
- $scope.advanced.combinedScorers = [];
- $scope.advanced.userScorers = [];
- $scope.advanced.user = $rootScope.currentUser;
+ $scope.scorers = {};
+ $scope.scorers.communalScorers = [];
+ $scope.scorers.combinedScorers = [];
+ $scope.scorers.userScorers = [];
+ $scope.scorers.user = $rootScope.currentUser;
$scope.pagination = {
scorers: {
@@ -34,10 +36,10 @@ angular.module('QuepidApp')
$scope.communalScorersOnly = configurationSvc.isCommunalScorersOnly();
// Functions
- $scope.advanced.updateUserScorer = updateUserScorer;
+ $scope.scorers.updateUserScorer = updateUserScorer;
$rootScope.$watch('currentUser', function() {
- $scope.advanced.user = $rootScope.currentUser;
+ $scope.scorers.user = $rootScope.currentUser;
});
$scope.loading = true;
@@ -57,9 +59,9 @@ angular.module('QuepidApp')
});
function getLists() {
- $scope.advanced.communalScorers = customScorerSvc.communalScorers;
- $scope.advanced.userScorers = customScorerSvc.scorers;
- $scope.advanced.combinedScorers = $scope.advanced.communalScorers.concat($scope.advanced.userScorers);
+ $scope.scorers.communalScorers = customScorerSvc.communalScorers;
+ $scope.scorers.userScorers = customScorerSvc.scorers;
+ $scope.scorers.combinedScorers = $scope.scorers.communalScorers.concat($scope.scorers.userScorers);
}
function updateUserScorer(scorerId) {
diff --git a/app/assets/javascripts/routes.js b/app/assets/javascripts/routes.js
index 65dd151d6..666194307 100644
--- a/app/assets/javascripts/routes.js
+++ b/app/assets/javascripts/routes.js
@@ -57,9 +57,9 @@ angular.module('QuepidApp')
templateUrl: 'views/teams/show.html',
controller: 'TeamCtrl'
})
- .when('/advanced', {
- templateUrl: 'views/advanced/index.html',
- controller: 'AdvancedCtrl'
+ .when('/scorers', {
+ templateUrl: 'views/scorers/index.html',
+ controller: 'ScorersCtrl'
})
.otherwise({
templateUrl: 'views/404.html',
diff --git a/app/assets/javascripts/services/userSvc.js b/app/assets/javascripts/services/userSvc.js
index 13b8315d4..c415ea820 100644
--- a/app/assets/javascripts/services/userSvc.js
+++ b/app/assets/javascripts/services/userSvc.js
@@ -10,7 +10,7 @@ angular.module('UtilitiesModule')
var self = this;
// Make sure the user's scorerId is an int instead of a string.
- // In the advanced screen, the dropdown lists the scorers' id as a number
+ // In the Scorers screen, the dropdown lists the scorers' id as a number
// so the comparison fails if the user's scorerId is a string, and
// even if the user has a default scorer it would look like as
// if he does not.
diff --git a/app/assets/templates/views/pick_scorer.html b/app/assets/templates/views/pick_scorer.html
index 980d2ef04..b95122f79 100644
--- a/app/assets/templates/views/pick_scorer.html
+++ b/app/assets/templates/views/pick_scorer.html
@@ -27,7 +27,7 @@ Select from defaults: