Merge commit '8d50cf48dc96bc30df78a0fb7fcd972390a61792' into HEAD

Author: Jenkins Continuous Integration Server

app/directives/page-state-header/page-state-header.directive.js

@@ -4,7 +4,7 @@
   angular.module('tcUIComponents').directive('pageStateHeader', function() {
     return {
       restrict: 'E',
-      templateUrl: 'directives/page-state-header/page-state-header.directive.html',
+      templateUrl: 'directives/page-state-header/page-state-header.html',
       transclude: true,
       scope: {
         handle: '@',

app/directives/page-state-header/page-state-header.directive.jade renamed to app/directives/page-state-header/page-state-header.jade

@@ -1,7 +1,7 @@
 .page-state-header
   header
     .page-info
-      h1 {{pageTitle}}
+      h1 {{pageTitle | track}}
 
       div(ng-transclude)
 

app/directives/tc-file-input/tc-file-input.jade

@@ -3,10 +3,10 @@
     span.lowercase(ng-if="showFileType") {{ ' *(.' + fileType + ')'}}
 
 .tc-file-field__inputs
-  div
+  .tc-label__wrapper
     input.tc-file-field__input(type="text", placeholder="{{placeholder}}", disabled)
 
-    span.tc-label__mandatory.lowercase(ng-if="mandatory") #[span *]mandatory
+    span.tc-label__asterisk.lowercase(ng-if="mandatory") #[span *]mandatory
 
   button.tc-btn(ng-click="selectFile()") {{buttonText}}
 

app/directives/tc-form-stockart/tc-form-stockart.jade

@@ -4,6 +4,7 @@
   tc-input.fieldset__input(
     label-text="Photo Description",
     asterisk-text="Field can't be empty",
+    show-asterisk-text="true",
     placeholder="A picture of a girl",
     input-value="stockart.description",
     input-name="photoDescription{{stockartId}}",
@@ -15,6 +16,7 @@
   tc-input.fieldset__input(
     label-text="Photo URL",
     asterisk-text="Field can't be empty",
+    show-asterisk-text="true",
     placeholder="www.istockphoto.com",
     input-value="stockart.sourceUrl",
     input-name="photoURL{{stockartId}}",
@@ -30,6 +32,7 @@
   tc-input.fieldset__input(
     label-text="File Number",
     asterisk-text="Field can't be empty",
+    show-asterisk-text="true",
     placeholder="u2434312",
     input-value="stockart.fileNumber",
     input-name="fileNumber{{stockartId}}",

app/directives/tc-input/tc-input.directive.js

@@ -10,6 +10,7 @@
       scope: {
         labelText: '@',
         asteriskText: '@',
+        showAsteriskText: '@',
         placeholder: '@',
         inputValue: '=',
         inputName: '@',

app/directives/tc-input/tc-input.jade

@@ -1,15 +1,16 @@
 label.tc-label {{labelText}}
 
-p.tc-label__asterisk(ng-if="inputRequired") #[span *]{{asteriskText}}
+.tc-label__wrapper
+  p.tc-label__asterisk(ng-if="inputRequired && showAsteriskText") #[span *]{{asteriskText}}
 
-input(
-  name="{{inputName}}",
-  type="{{inputType}}",
-  placeholder="{{placeholder}}",
-  ng-model="inputValue",
-  ng-pattern="inputPattern",
-  ng-required="inputRequired",
-  ng-disabled="inputDisabled",
-  maxlength="{{maxlength}}",
-  ng-change="onChange()"
-)
+  input(
+    name="{{inputName}}",
+    type="{{inputType}}",
+    placeholder="{{placeholder}}",
+    ng-model="inputValue",
+    ng-pattern="inputPattern",
+    ng-required="inputRequired",
+    ng-disabled="inputDisabled",
+    maxlength="{{maxlength}}",
+    ng-change="onChange()"
+  )

app/filters/track.filter.js

@@ -9,7 +9,7 @@
 
       var map = {
         'UI_PROTOTYPE_COMPETITION': 'UI Prototype Competition',
-        'ASSEMBLY_COMPETITION': 'ASSEMBLY',
+        'ASSEMBLY_COMPETITION': 'Assembly',
         'RIA_BUILD_COMPETITION': 'RIA Build Competition',
         'RIA_COMPONENT_COMPETITION': 'RIA Component Competition',
         'DEVELOP_MARATHON_MATCH': 'Marathon Match',

app/profile/subtrack/subtrack.controller.js

@@ -25,7 +25,7 @@
     vm.back = back;
     vm.subTrackStats = [];
 
-    vm.pageName = vm.subTrack.toLowerCase().replace(/_/g, ' ');
+    vm.pageName = vm.subTrack;
 
     vm.tabs = ['statistics'];
 

app/profile/subtrack/subtrack.jade

@@ -1,5 +1,5 @@
 .profile-subtrack-container(ng-cloak, ng-show="profileVm.status.stats === 'ready'")
-  .content 
+  .content
     .page-header
       page-state-header(handle="{{vm.userHandle}}", page-title="{{vm.pageName}}", hide-money="true", show-back-link="true", default-state="profile")
         .nav-right
@@ -11,7 +11,7 @@
             .carousel-elem
               a.flex-wrapper(ng-class="{'link': item.link, 'no-link': !item.link}", ng-href="{{item.link}}")
                 p.title(ng-hide="true") {{item.subTrack | track}}
-                
+
                 p.value(ng-show="item.label === 'rating'", style="color: {{item.val |  ratingColor}}") {{item.val | empty}}
                   span(style="background-color: {{item.val | ratingColor}}")
 
@@ -22,20 +22,20 @@
         include ./develop/develop-statistics.jade
         include ./design/design-statistics.jade
         include ./data/data-statistics.jade
-        
+
       tc-tab(heading="{{vm.tabs[1]}}")
         .subtrack-stats
           responsive-carousel(data="vm.subTrackStats", handle="{{vm.handle}}")
             .carousel-elem
               .flex-wrapper
                 p.title(ng-hide="true") {{item.subTrack | track}}
-                
+
                 p.value(ng-show="item.label === 'rating'", style="color: {{item.val |  ratingColor}}") {{item.val | empty}}
                   span(style="background-color: {{item.val | ratingColor}}")
 
                 p.value(ng-hide="item.label === 'rating'") {{item.val | empty}}
 
                 p.label {{item.label}}
-        include ./develop/develop-challenges.jade    
-        include ./design/design-challenges.jade    
+        include ./develop/develop-challenges.jade
+        include ./design/design-challenges.jade
         include ./data/data-challenges.jade

app/services/challenge.service.js

@@ -80,7 +80,7 @@
 
               // if user has role of observer
               var roles = _.get(challenge, 'userDetails.roles', []);
-              if (roles.length > 0) {
+              if (roles && roles.length > 0) {
                 var submitterRole = _.findIndex(roles, function(role) {
                   var lRole = role.toLowerCase();
                   return lRole === 'submitter';