Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Custom controller implementation #52

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gruntfile.js
Expand Up @@ -270,7 +270,7 @@ module.exports = function(grunt) {
[ 'jshint', 'concurrent:dev']);

grunt.registerTask('build' , 'minify css, create translations files from po, aggregate js files, copy fonts',
['shell:translation', 'copy:fonts', 'cssmin', 'requirejs', 'nggettext_compile']);
['shell:translation', 'copy:fonts', 'cssmin','nggettext_compile', 'requirejs']);

grunt.registerTask('allpot' , 'Create all POT files from source',
['shell:pot_server', 'nggettext_extract']);
Expand Down
2 changes: 2 additions & 0 deletions public/js/app.js
Expand Up @@ -9,6 +9,7 @@ define([
'directives',
'gettext',
'controllers',
'controllers-custom',
'angularRoute',
'angularAuth',
'paginateAnything',
Expand All @@ -27,6 +28,7 @@ define([
var gadael = angular.module('gadael', [
'ngRoute',
'gadael.controllers',
'gadael.controllers.custom',
'gadael.filters',
'gadael.services',
'gadael.directives',
Expand Down
9 changes: 9 additions & 0 deletions public/js/controllers-custom.js
@@ -0,0 +1,9 @@
define(['angular', 'services'], function (angular) {
'use strict';


// File only for custom controllers, will stay empty in futur gadael versions


return angular.module('gadael.controllers.custom', ['gadael.services']);
});
2 changes: 1 addition & 1 deletion public/partials/utils/common/user/user-edit-head.html
Expand Up @@ -23,7 +23,7 @@

<div class="form-group col-xs-12">
<label for="user_email" translate>Email</label>
<input type="text" class="form-control" id="user_email" ng-model="user.email" />
<input type="text" class="form-control" id="user_email" ng-model="user.email" ng-required="true" />
</div>
</div>
</div>
Expand Down