fixes language dropdown for form create modal

This commit is contained in:
David Baldwynn 2017-11-15 03:57:46 -08:00
parent 146cf9256d
commit a193d78d90
2 changed files with 6 additions and 5 deletions

View File

@ -1,13 +1,14 @@
'use strict';
// Forms controller
angular.module('forms').controller('ListFormsController', ['$rootScope', '$scope', '$stateParams', '$state', 'GetForms', 'CurrentForm', '$http', '$uibModal', 'myForms',
function($rootScope, $scope, $stateParams, $state, GetForms, CurrentForm, $http, $uibModal, myForms) {
angular.module('forms').controller('ListFormsController', ['$rootScope', '$scope', '$stateParams', '$state', 'GetForms', 'CurrentForm', '$http', '$uibModal', 'myForms','$window',
function($rootScope, $scope, $stateParams, $state, GetForms, CurrentForm, $http, $uibModal, myForms, $window) {
$scope = $rootScope;
$scope.forms = {};
$scope.showCreateModal = false;
$scope.myforms = myForms
$scope.formLanguage = $window.$locale;
$rootScope.languageRegExp = {
regExp: /[@!#$%^&*()\-+={}\[\]|\\/'";:`.,~№?<>]+/i,

View File

@ -52,9 +52,9 @@
<div class="col-xs-5 field-title text-left"> {{ 'LANGUAGE' | translate }} </div>
<div class="col-xs-12 field-input">
<div class="button custom-select">
<select style="color:black;" name="language" required ng-model="formLanguage" ng-init="formLanguage = user.language">
<option ng-repeat="language in languages" value="{{language}}">
{{language}}
<select style="color:black;" name="language" required ng-model="formLanguage">
<option ng-repeat="language in $root.languages" value="{{language}}">
{{ $root.langCodeToWord[language] }}
</option>
</select>
</div>