Show labels for points name even if there is no community setting. Re…

…solves #1
mbosecke · Oct 16, 2016 · dea9816 · dea9816
1 parent b8fc0c4
commit dea9816
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/main/java/com/mitchellbosecke/seniorcommander/web/controller/CommunityController.java b/src/main/java/com/mitchellbosecke/seniorcommander/web/controller/CommunityController.java
@@ -136,7 +136,8 @@ private void addCommonMavObjects(ModelAndView mav, String communityName, String
         mav.addObject("communityUserModels", communityUserService.findMemberships());
         mav.addObject("communityUserModel", communityUserModel);
         mav.addObject("hasOwnerAccess", communityPermissions.hasAccess(communityName, AccessLevel.OWNER));
-        mav.addObject("pointsPlural", communityUserModel.getCommunityModel().getSetting("points.plural"));
+        String pointsPlural = communityUserModel.getCommunityModel().getSetting("points.plural");
+        mav.addObject("pointsPlural", pointsPlural == null? "Points" : pointsPlural);
         mav.addObject("activeTab", activeTab);
     }
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -7,8 +7,8 @@ spring:
 security:
   oauth2:
     client:
-      clientId: hlwwxhj8cgqapba47blso4hwuh3amv0
-      clientSecret: 5m8x6gpddwcweewry4tbdowpxbqddrh
+      clientId: hk8e73z9j2d3xplierlk0e7mgo3bw23
+      clientSecret: jky4h8bo4bd471hluzmhejceg3111s0
       accessTokenUri: https://api.twitch.tv/kraken/oauth2/token
       userAuthorizationUri: https://api.twitch.tv/kraken/oauth2/authorize
       tokenName: oauth_token

diff --git a/src/main/resources/templates/admin.html b/src/main/resources/templates/admin.html
@@ -101,7 +101,7 @@ <h2 id="points">Points</h2>
                     {{ label('pointsPlural', 'Name of points') }}
                     <div class="col-sm-9">
                         <input type="text" class="form-control" name="pointsPlural" id="pointsPlural"
-                               value="{{pointsPlural | default('points')}}">
+                               value="{{pointsPlural | default('Points')}}">
                         {{ fieldErrors(getFieldErrors('pointsForm', 'pointsPlural')) }}
                         <span class="help-block">This affects leaderboard and bot messages but not the <code>!points</code> command; use an alias for a custom command.</span>
                     </div>