keeweb/keeweb
1
0
Fork 0
mirror of https://github.com/keeweb/keeweb.git synced 2024-06-26 07:39:04 +02:00
Code Issues Releases Wiki Activity

fixed group settings not being displayed

Browse Source
This commit is contained in:
antelle 2019-08-24 07:09:53 +02:00
parent 087b1937de
commit 8a258998dd
3 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/scripts/views/app-view.js
View File

@ -272,8 +272,8 @@ const AppView = Backbone.View.extend({
this.views.menu.switchVisibility(false); this.views.menu.switchVisibility(false);
}, },
showEditGroup() { showEditGroup(group) {
this.showPanelView(new GrpView()); this.showPanelView(new GrpView({ model: group }));
}, },
showEditTag() { showEditTag() {
@ -661,8 +661,7 @@ const AppView = Backbone.View.extend({
editGroup(group) { editGroup(group) {
if (group && !(this.views.panel instanceof GrpView)) { if (group && !(this.views.panel instanceof GrpView)) {
this.showEditGroup(); this.showEditGroup(group);
this.views.panel.showGroup(group);
} else { } else {
this.showEntries(); this.showEntries();
} }

39
app/scripts/views/grp-view.js
View File

@ -24,24 +24,22 @@ const GrpView = Backbone.View.extend({
render() { render() {
this.removeSubView(); this.removeSubView();
if (this.model) { this.renderTemplate(
this.renderTemplate( {
{ title: this.model.get('title'),
title: this.model.get('title'), icon: this.model.get('icon') || 'folder',
icon: this.model.get('icon') || 'folder', customIcon: this.model.get('customIcon'),
customIcon: this.model.get('customIcon'), enableSearching: this.model.getEffectiveEnableSearching(),
enableSearching: this.model.getEffectiveEnableSearching(), readonly: this.model.get('top'),
readonly: this.model.get('top'), canAutoType: AutoType.enabled,
canAutoType: AutoType.enabled, autoTypeSeq: this.model.get('autoTypeSeq'),
autoTypeSeq: this.model.get('autoTypeSeq'), autoTypeEnabled: this.model.getEffectiveEnableAutoType(),
autoTypeEnabled: this.model.getEffectiveEnableAutoType(), defaultAutoTypeSeq: this.model.getParentEffectiveAutoTypeSeq()
defaultAutoTypeSeq: this.model.getParentEffectiveAutoTypeSeq() },
}, true
true );
); if (!this.model.get('title')) {
if (!this.model.get('title')) { this.$el.find('#grp__field-title').focus();
this.$el.find('#grp__field-title').focus();
}
} }
this.createScroll({ this.createScroll({
root: this.$el.find('.grp')[0], root: this.$el.find('.grp')[0],
@ -59,11 +57,6 @@ const GrpView = Backbone.View.extend({
} }
}, },
showGroup(group) {
this.model = group;
this.render();
},
changeTitle(e) { changeTitle(e) {
const title = $.trim(e.target.value); const title = $.trim(e.target.value);
if (title) { if (title) {

3
release-notes.md
View File

@ -1,5 +1,8 @@
Release notes Release notes
------------- -------------
##### v1.9.3 (2019-08-25)
`-` fixed group settings not being displayed
##### v1.9.2 (2019-08-22) ##### v1.9.2 (2019-08-22)
`-` fix #1235: custom themes loading `-` fix #1235: custom themes loading
`-` fix #1234 auto-type issues in xubuntu/xfce `-` fix #1234 auto-type issues in xubuntu/xfce