Fix bugs in types and custom fields

pull/7963/head
Inga Mai 5 years ago
parent b6de008196
commit d446cb9366
  1. 4
      app/helpers/types_helper.rb
  2. 4
      app/views/types/edit.html.erb
  3. 6
      frontend/src/app/modules/admin/tabs/content-tabs.component.ts

@ -28,9 +28,9 @@
#++
module ::TypesHelper
def types_tabs(type)
def types_tabs
[
{ name: 'settings', partial: 'types/form/settings',path: edit_type_tab_path(id: @type.id, tab: :settings), label: 'types.edit.settings' },
{ name: 'settings', partial: 'types/form/settings', path: edit_type_tab_path(id: @type.id, tab: :settings), label: 'types.edit.settings' },
{ name: 'form_configuration', partial: 'types/form/form_configuration', path: edit_type_tab_path(id: @type.id, tab: :form_configuration), label: 'types.edit.form_configuration' },
{ name: 'projects', partial: 'types/form/projects', path: edit_type_tab_path(id: @type.id, tab: :projects), label: 'types.edit.projects' }
]

@ -36,8 +36,6 @@ See docs/COPYRIGHT.rdoc for more details.
<%= breadcrumb_toolbar @type.name %>
</div>
<%= render_tabs types_tabs(@type) %>
<%= render_tabs types_tabs %>
<%= error_messages_for 'type' %>
<%= render partial: "types/form/#{@tab}" %>

@ -30,7 +30,8 @@ import {
Component,
OnDestroy,
Input,
ElementRef
ElementRef,
ChangeDetectionStrategy
} from '@angular/core';
import {DynamicBootstrapper} from "core-app/globals/dynamic-bootstrapper";
import {GonService} from "core-app/modules/common/gon/gon.service";
@ -50,7 +51,8 @@ interface GonTab {
@Component({
selector: contentTabsSelector,
templateUrl: '/app/modules/common/tabs/scrollable-tabs.component.html'
templateUrl: '/app/modules/common/tabs/scrollable-tabs.component.html',
changeDetection: ChangeDetectionStrategy.OnPush
})
export class ContentTabsComponent extends ScrollableTabsComponent {

Loading…
Cancel
Save