Download as
Browse Code »

Commit efa64a1346550878c6924241d010828f75d8bf20

Authored by Michel Felipe de Oliveira Ferreira - SUPDE/DESDR/DE502
Committed by Carlos Purificação
1 parent 556724ef
Exists in master and in 30 other branches activities_block, btn-new-post, cosmetic_changes_people_and_communities_block, edit-blocks, edit-header-footer, env-tags-block, forgot_password, header_and_footer, layout_support, list_articles_on_blog, loading-indicator-component, login_modal, login_modal_improve, person_info_block, profile-article-resolvers, profile-blocks-sass, profile_description_block_component, profile_page_improvements, recent-activities, remove-article-confirmation, responsive-fixes, seo, signup_page, skin-small-change, staging, tags-block, theme-skin-yellow, translations, updated_signup_page, users_profile_page

Fix helpers.ts type problems and added conditional to show profile custom-fields table

Showing 2 changed files with 2 additions and 3 deletions   Show diff stats
src/app/profile/data/profile-data.component.spec.ts
  Diff comments   View file @efa64a1
@@ -52,11 +52,10 @@ describe('Profile data component', () => { @@ -52,11 +52,10 @@ describe('Profile data component', () => {
52 profileMock.additional_data = { 52 profileMock.additional_data = {
53 'Address': 'Street A, Number 102' 53 'Address': 'Street A, Number 102'
54 }; 54 };
  55 +
55 buildComponent().then((fixture: ComponentFixture) => { 56 buildComponent().then((fixture: ComponentFixture) => {
56 let profileData: ProfileDataComponent = fixture.debugElement.componentViewChildren[0].componentInstance; 57 let profileData: ProfileDataComponent = fixture.debugElement.componentViewChildren[0].componentInstance;
57 profileData.profile = profileMock; 58 profileData.profile = profileMock;
58 -  
59 - expect(profileData.hasCustomFields()).toBeTruthy();  
60 expect(fixture.debugElement.query('div.profile-custom-fields').length).toEqual(1); 59 expect(fixture.debugElement.query('div.profile-custom-fields').length).toEqual(1);
61 }); 60 });
62 }); 61 });
src/app/profile/data/profile-data.html
  Diff comments   View file @efa64a1
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 </div> 22 </div>
23 23
24 <!-- Custom Fields --> 24 <!-- Custom Fields -->
25 -<div class="main-box clearfix profile-custom-fields" ng-if="ctrl.hasCustomFields()"> 25 +<div class="main-box clearfix profile-custom-fields" ng-if="!equals({},ctrl.profile.additional_data)">
26 <header class="main-box-header clearfix"> 26 <header class="main-box-header clearfix">
27 <h2>{{"profile.others_info" | translate}}</h2> 27 <h2>{{"profile.others_info" | translate}}</h2>
28 </header> 28 </header>