mirror of https://github.com/keeweb/keeweb.git
fixed group settings not being displayed
This commit is contained in:
parent
ba122bd9d0
commit
80c44c4c03
|
@ -272,8 +272,8 @@ const AppView = Backbone.View.extend({
|
|||
this.views.menu.switchVisibility(false);
|
||||
},
|
||||
|
||||
showEditGroup() {
|
||||
this.showPanelView(new GrpView());
|
||||
showEditGroup(group) {
|
||||
this.showPanelView(new GrpView({ model: group }));
|
||||
},
|
||||
|
||||
showEditTag() {
|
||||
|
@ -661,8 +661,7 @@ const AppView = Backbone.View.extend({
|
|||
|
||||
editGroup(group) {
|
||||
if (group && !(this.views.panel instanceof GrpView)) {
|
||||
this.showEditGroup();
|
||||
this.views.panel.showGroup(group);
|
||||
this.showEditGroup(group);
|
||||
} else {
|
||||
this.showEntries();
|
||||
}
|
||||
|
|
|
@ -24,24 +24,22 @@ const GrpView = Backbone.View.extend({
|
|||
|
||||
render() {
|
||||
this.removeSubView();
|
||||
if (this.model) {
|
||||
this.renderTemplate(
|
||||
{
|
||||
title: this.model.get('title'),
|
||||
icon: this.model.get('icon') || 'folder',
|
||||
customIcon: this.model.get('customIcon'),
|
||||
enableSearching: this.model.getEffectiveEnableSearching(),
|
||||
readonly: this.model.get('top'),
|
||||
canAutoType: AutoType.enabled,
|
||||
autoTypeSeq: this.model.get('autoTypeSeq'),
|
||||
autoTypeEnabled: this.model.getEffectiveEnableAutoType(),
|
||||
defaultAutoTypeSeq: this.model.getParentEffectiveAutoTypeSeq()
|
||||
},
|
||||
true
|
||||
);
|
||||
if (!this.model.get('title')) {
|
||||
this.$el.find('#grp__field-title').focus();
|
||||
}
|
||||
this.renderTemplate(
|
||||
{
|
||||
title: this.model.get('title'),
|
||||
icon: this.model.get('icon') || 'folder',
|
||||
customIcon: this.model.get('customIcon'),
|
||||
enableSearching: this.model.getEffectiveEnableSearching(),
|
||||
readonly: this.model.get('top'),
|
||||
canAutoType: AutoType.enabled,
|
||||
autoTypeSeq: this.model.get('autoTypeSeq'),
|
||||
autoTypeEnabled: this.model.getEffectiveEnableAutoType(),
|
||||
defaultAutoTypeSeq: this.model.getParentEffectiveAutoTypeSeq()
|
||||
},
|
||||
true
|
||||
);
|
||||
if (!this.model.get('title')) {
|
||||
this.$el.find('#grp__field-title').focus();
|
||||
}
|
||||
this.createScroll({
|
||||
root: this.$el.find('.grp')[0],
|
||||
|
@ -59,11 +57,6 @@ const GrpView = Backbone.View.extend({
|
|||
}
|
||||
},
|
||||
|
||||
showGroup(group) {
|
||||
this.model = group;
|
||||
this.render();
|
||||
},
|
||||
|
||||
changeTitle(e) {
|
||||
const title = $.trim(e.target.value);
|
||||
if (title) {
|
||||
|
|
|
@ -3,6 +3,9 @@ Release notes
|
|||
##### v1.10 (TBD)
|
||||
`+` config option to disable xml export (canExportXml)
|
||||
|
||||
##### v1.9.3 (2019-08-25)
|
||||
`-` fixed group settings not being displayed
|
||||
|
||||
##### v1.9.2 (2019-08-22)
|
||||
`-` fix #1235: custom themes loading
|
||||
`-` fix #1234: auto-type issues in xubuntu/xfce
|
||||
|
|
Loading…
Reference in New Issue