summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2020-06-11 00:35:30 +0200
committerJules Laplace <julescarbon@gmail.com>2020-06-11 00:35:30 +0200
commiteb5136e2023fb0999995befff60624d5d4c51c94 (patch)
tree6129655ffca1afdcfedca826c1d47609e6292b69
parent9a1cac006a80098f90f2febf751632c7e5ffbfa0 (diff)
fixing bugs
-rw-r--r--cli/app/controllers/page_controller.py2
-rw-r--r--cli/app/sql/models/page.py2
-rw-r--r--frontend/views/graph/components/page.new.js2
-rw-r--r--frontend/views/index/containers/graph.index.js2
-rw-r--r--frontend/views/page/components/page.editor.js2
-rw-r--r--frontend/views/page/components/tile.form.js3
6 files changed, 8 insertions, 5 deletions
diff --git a/cli/app/controllers/page_controller.py b/cli/app/controllers/page_controller.py
index 587c61d..236b6f8 100644
--- a/cli/app/controllers/page_controller.py
+++ b/cli/app/controllers/page_controller.py
@@ -20,6 +20,8 @@ class PageView(CrudView):
def on_create(self, session, form, item):
item.settings = form['settings']
+ if form['description'] is None or item.description is None:
+ item.description = ''
item.graph_id = int(form['graph_id'])
def on_update(self, session, form, item):
diff --git a/cli/app/sql/models/page.py b/cli/app/sql/models/page.py
index 4ca758d..2f7065b 100644
--- a/cli/app/sql/models/page.py
+++ b/cli/app/sql/models/page.py
@@ -51,6 +51,6 @@ class Page(Base):
class PageForm(ModelForm):
class Meta:
model = Page
- exclude = ['settings', 'created_at', 'updated_at']
+ exclude = ['description', 'settings', 'created_at', 'updated_at']
def get_session():
return Session()
diff --git a/frontend/views/graph/components/page.new.js b/frontend/views/graph/components/page.new.js
index 921bebd..bc74358 100644
--- a/frontend/views/graph/components/page.new.js
+++ b/frontend/views/graph/components/page.new.js
@@ -19,7 +19,7 @@ class PageNew extends Component {
}
})
.catch(err => {
- console.error('error')
+ console.error('error', err)
})
}
diff --git a/frontend/views/index/containers/graph.index.js b/frontend/views/index/containers/graph.index.js
index c02ad79..35c2d82 100644
--- a/frontend/views/index/containers/graph.index.js
+++ b/frontend/views/index/containers/graph.index.js
@@ -13,7 +13,7 @@ class GraphIndex extends Component {
}
render() {
const { index } = this.props
- console.log(this.props)
+ // console.log(this.props)
if (!index.order) {
return (
<div className='graphIndex'>
diff --git a/frontend/views/page/components/page.editor.js b/frontend/views/page/components/page.editor.js
index 3878208..24e2075 100644
--- a/frontend/views/page/components/page.editor.js
+++ b/frontend/views/page/components/page.editor.js
@@ -158,7 +158,7 @@ class PageEditor extends Component {
}
render(){
- if (!this.state.bounds || !this.props.page.show.res) {
+ if (!this.state.bounds || (!this.props.page.show.res && !this.props.page.show.res.tiles)) {
return (
<div className='page' ref={this.pageRef} />
)
diff --git a/frontend/views/page/components/tile.form.js b/frontend/views/page/components/tile.form.js
index bfc5c0b..8d26173 100644
--- a/frontend/views/page/components/tile.form.js
+++ b/frontend/views/page/components/tile.form.js
@@ -117,9 +117,10 @@ class TileForm extends Component {
errorFields: new Set([]),
})
const { pages } = graph.show.res
+ const linkPages = initialData ? pages.filter(page => page.id !== initialData.id) : pages
let pageList = [
...PAGE_LIST_TOP_OPTIONS,
- ...pages.map(page => ({ name: page.id, label: page.title }))
+ ...linkPages.map(page => ({ name: page.id, label: page.path }))
]
this.setState({ pageList })
if (isNew) {