self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00
Code Issues Releases Activity

Handle reserved names in RN

Browse Source
This commit is contained in:
Laurent Cozic
2017-07-15 17:25:33 +01:00
parent 0e05567706
commit e3db1e028a
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ReactNativeClient/lib/components/screens/folder.js
View File

@@ -7,6 +7,8 @@ import { BaseModel } from 'lib/base-model.js'
import { ScreenHeader } from 'lib/components/screen-header.js';
import { NotesScreenUtils } from 'lib/components/screens/notes-utils.js'
import { BaseScreenComponent } from 'lib/components/base-screen.js';
import { dialogs } from 'lib/dialogs.js';
import { _ } from 'lib/locale.js';
class FolderScreenComponent extends BaseScreenComponent {
@@ -50,7 +52,17 @@ class FolderScreenComponent extends BaseScreenComponent {
if (this.originalFolder) toSave.id = this.originalFolder.id;
this.originalFolder = await Folder.save(toSave);
try {
let f = await Folder.save(toSave, {
duplicateCheck: true,
reservedTitleCheck: true,
});
this.originalFolder = f;
} catch (error) {
dialogs.error(this, _('The folder could not be saved: %s', error.message));
return;
}
this.setState({ folder: this.originalFolder });
await NotesScreenUtils.openDefaultNoteList();
@@ -62,6 +74,7 @@ class FolderScreenComponent extends BaseScreenComponent {
<ScreenHeader navState={this.props.navigation.state} />
<TextInput value={this.state.folder.title} onChangeText={(text) => this.title_changeText(text)} />
<Button title="Save folder" onPress={() => this.saveFolderButton_press()} />
<dialogs.DialogBox ref={dialogbox => { this.dialogbox = dialogbox }}/>
</View>
);
}