verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details

This commit is contained in:
Joan Sanchez 2020-03-11 13:38:28 +01:00
parent 79498fe4a0 aba24292cf
commit ac2b04d117
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
front/core/services/modules.js
View File

@ -45,8 +45,9 @@ export default class Modules {
const translatedNameB = this.$translate.instant(b.name); const translatedNameB = this.$translate.instant(b.name);
return translatedNameA.localeCompare(translatedNameB); return translatedNameA.localeCompare(translatedNameB);
}); });
this.modules = sortedModules;
return sortedModules; return this.modules;
} }
} }
Modules.$inject = ['aclService', '$window', '$translate']; Modules.$inject = ['aclService', '$window', '$translate'];

2
front/salix/components/home/home.html
View File

@ -8,7 +8,7 @@
<div> <div>
<vn-icon icon="{{::mod.icon || 'photo'}}"></vn-icon> <vn-icon icon="{{::mod.icon || 'photo'}}"></vn-icon>
</div> </div>
<h4 ng-bind-html="::$ctrl.getModuleName(mod)"></h4> <h4 ng-bind-html="$ctrl.getModuleName(mod)"></h4>
<span <span
ng-show="::mod.keyBind" ng-show="::mod.keyBind"
vn-tooltip="Ctrl + Alt + {{::mod.keyBind}}"> vn-tooltip="Ctrl + Alt + {{::mod.keyBind}}">