Merge branch 'dev'

matortheeternal · Apr 11, 2017 · ec7fa96 · ec7fa96
2 parents 0231443 + e9c0c01
commit ec7fa96
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/mod-picker/app/assets/javascripts/Views/mod/modClassification.js b/mod-picker/app/assets/javascripts/Views/mod/modClassification.js
@@ -48,6 +48,7 @@ app.controller('modClassificationController', function($scope, $rootScope, $time
     };
 
     $scope.loadTagGroupTags = function() {
+        if (!$scope.mod.tags) return;
         $scope.mod.tags.forEach(function(tag) {
             $scope.toggleTagGroupTag(tag.text, true)
         });

diff --git a/mod-picker/app/assets/javascripts/Views/mod/submitMod.js b/mod-picker/app/assets/javascripts/Views/mod/submitMod.js
@@ -71,7 +71,8 @@ app.controller('submitModController', function($scope, $rootScope, $state, modSe
         }],
         custom_sources: [],
         requirements: [],
-        categories: []
+        categories: [],
+        tags: []
     };
     $scope.defaultSrc = '/mods/Default-big.png';
     $scope.imageSizes = [

diff --git a/mod-picker/public/resources/partials/submitMod/classification.html b/mod-picker/public/resources/partials/submitMod/classification.html
@@ -1,7 +1,7 @@
 <mod-categories></mod-categories>
 
-<h3 class="section-title" ng-show="tagGroupColumns.length">Tags
-    <span class="help-tooltip" ng-hide="hideTooltips" title="Keywords that describe the mod to help users find it easier.">
+<h3 class="section-title" ng-show="tagGroupColumns.length">Tag Groups
+    <span class="help-tooltip" ng-hide="hideTooltips" title="Tags commonly used on mods in the categories you have selected.">
         <i class="fa fa-question-circle"></i>
     </span>
 </h3>
@@ -13,7 +13,7 @@ <h4>{{group.name}}</h4>
             <ul class="checkbox-list">
                 <li ng-repeat="tag in group.tag_group_tags">
                     <label>
-                        <input type="checkbox" ng-model="tag.enabled">
+                        <input type="checkbox" ng-model="tag.enabled" ng-change="toggleTag(tag)">
                         {{::tag.tag_text}}
                     </label>
                 </li>
@@ -22,8 +22,8 @@ <h4>{{group.name}}</h4>
     </div>
 </section>
 
-<h3 class="section-title">Custom Tags
-    <span class="help-tooltip" ng-hide="hideTooltips" title="You can apply other tags to the mod here.">
+<h3 class="section-title">Tags
+    <span class="help-tooltip" ng-hide="hideTooltips" title="Keywords that describe the mod to help users find it easier.  You can apply custom tags here.">
         <i class="fa fa-question-circle"></i>
     </span>
 </h3>