Skip to content

Commit

Permalink
polish
Browse files Browse the repository at this point in the history
  • Loading branch information
deepu105 committed Apr 15, 2017
1 parent c6a4120 commit 60e660f
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ import { <%=angular2AppName%>AdminModule } from './admin/admin.module';
import { <%=angular2AppName%>AccountModule } from './account/account.module';
import { <%=angular2AppName%>EntityModule } from './entities/entity.module';

import { LayoutRoutingModule } from './layouts';
import { customHttpProvider } from './blocks/interceptor/http.provider';
import { PaginationConfig } from './blocks/config/uib-pagination.config';

import {
<%=jhiPrefixCapitalized%>MainComponent,
LayoutRoutingModule,
NavbarComponent,
FooterComponent,
ProfileService,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export class <%=jhiPrefixCapitalized%>MainComponent implements OnInit {
<%_ if (enableTranslation) { _%>
this.jhiLanguageHelper.updateTitle(this.getPageTitle(this.router.routerState.snapshot.root));
<%_ } else { _%>
this.titleService.setTitle(this.getPageTitle(this.router.routerState.snapshot.root));
this.titleService.setTitle(this.getPageTitle(this.router.routerState.snapshot.root));
<%_ } _%>
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-%>
export * from './constants/pagination.constants';
export * from './alert/alert.component';
export * from './alert/alert-error.component';
export * from './auth/csrf.service';
Expand All @@ -31,6 +32,7 @@ export * from './auth/auth-session.service';
export * from './auth/auth.service';
export * from './auth/principal.service';
export * from './auth/has-any-authority.directive';
export * from './auth/user-route-access-service';
<%_ if (enableTranslation) { _%>
export * from './language/language.constants';
export * from './language/language.helper';
Expand All @@ -42,7 +44,6 @@ export * from './tracker/tracker.service';
export * from './login/login.component';
export * from './login/login.service';
export * from './login/login-modal.service';
export * from './constants/pagination.constants';
export * from './user/account.model';
<%_ if (!skipUserManagement) { _%>
export * from './user/user.model';
Expand All @@ -55,4 +56,3 @@ export * from './social/social.component';
export * from './shared-libs.module';
export * from './shared-common.module';
export * from './shared.module';
export * from './auth/user-route-access-service';
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export class StateStorageService {
'params': destinationStateParams,
'from': {
'name': fromState.name,
}
}
};
this.$sessionStorage.store('destinationState', destinationInfo);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export class LoginService {
});
}
<%_ if (authenticationType == 'jwt') { _%>

loginWithToken(jwt, rememberMe) {
return this.authServerProvider.loginWithToken(jwt, rememberMe);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export class User {
public lastModifiedBy?: string;
public lastModifiedDate?: Date;
public password?: string;

constructor(
id?: any,
login?: string,
Expand Down
2 changes: 1 addition & 1 deletion generators/server/templates/_pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
<artifactId>metrics-json</artifactId>
<version>${dropwizard-metrics.version}</version>
</dependency>
<% if (hibernateCache == 'ehcache') { %>
<%_ if (hibernateCache == 'ehcache') { _%>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jcache</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;

/**
* Controller to authenticate users.
*/
@RestController
@RequestMapping("/api")
public class UserJWTController {
Expand Down

0 comments on commit 60e660f

Please sign in to comment.