Fixes

Communication-Systems-Group · Sep 23, 2015 · 44d8f11 · 44d8f11
1 parent 3a6039d
commit 44d8f11
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/html/templates/administration/show-cost-category.modal.tpl.html b/src/html/templates/administration/show-cost-category.modal.tpl.html
@@ -18,17 +18,17 @@ <h3 class="modal-title">
                     <select id="costcategory" class="form-control" ng-model="costCategoryObject" ng-options="category.name.de for category in costCategories"></select>
                 </div>
             </form>
-            <div class="row">
+            <div class="row" ng-if="costCategoryObject.description[language]">
                 <div class="col-md-12">
                     <h4>{{ 'reimbursement.cost_category.description' | translate }}</h4>
                     <div class="alert alert-info" role="alert">
                         {{costCategoryObject.description | costCategoryTranslation}}
                     </div>
                 </div>
             </div>
-            <div class="row">
+            <div class="row" ng-if="costCategoryObject.accountingPolicy[language]">
                 <div class="col-md-12">
-                    <h3>{{ 'reimbursement.cost_category.accounting_policy' | translate }}</h3>
+                    <h4>{{ 'reimbursement.cost_category.accounting_policy' | translate }}</h4>
                     <div class="alert alert-info" role="alert">
                         {{costCategoryObject.accountingPolicy | costCategoryTranslation}}
                     </div>

diff --git a/src/js/administration/show-cost-category.modal.controller.js b/src/js/administration/show-cost-category.modal.controller.js
@@ -1,8 +1,9 @@
-app.controller('CostCategoryModalController', [ '$scope', 'costCategories', 'costCategoryUid', '$modalInstance',
+app.controller('CostCategoryModalController', [ '$scope', 'costCategories', 'costCategoryUid', '$modalInstance', '$translate',
 
-	function ($scope, costCategories, costCategoryUid, $modalInstance) {
+	function ($scope, costCategories, costCategoryUid, $modalInstance, $translate) {
 		"use strict";
 
+        $scope.language = $translate.use();
         $scope.costCategories = costCategories;
         $scope.costCategoryUid = costCategoryUid;
         $scope.costCategoryObject = {};