From a9736c09fe55d57185a357cc1eff321c2a042b93 Mon Sep 17 00:00:00 2001 From: RemiZOffAlex Date: Sun, 5 Jul 2020 17:52:06 +0300 Subject: [PATCH] Update api and templates for note and page --- deploy/config/demo.py | 3 ++ myapp/ns_api/note.py | 48 ++++++++++----------- myapp/ns_api/page.py | 48 ++++++++++----------- myapp/ns_note/templates/note_edit.html | 2 +- myapp/ns_page/templates/user/page_add.html | 2 +- myapp/ns_page/templates/user/page_edit.html | 6 ++- 6 files changed, 57 insertions(+), 52 deletions(-) diff --git a/deploy/config/demo.py b/deploy/config/demo.py index a8ae276..02c1f6e 100644 --- a/deploy/config/demo.py +++ b/deploy/config/demo.py @@ -29,3 +29,6 @@ SECRET_KEY = '''0123456789''' LOG_FILE = DIR_DATA + '/myapp.log' LONG_LOG_FORMAT = '%(asctime)s - [%(name)s.%(levelname)s] [%(threadName)s, %(module)s.%(funcName)s@%(lineno)d] %(message)s' LOG_FILE_SIZE = 128 # Размер файла лога в МБ + +# Количество выводимых элементов на странице +ITEMS_ON_PAGE = 100 diff --git a/myapp/ns_api/note.py b/myapp/ns_api/note.py index 6d852cf..0decbc4 100644 --- a/myapp/ns_api/note.py +++ b/myapp/ns_api/note.py @@ -26,30 +26,6 @@ def note_id(id: int)->dict: return result -@jsonrpc.method('note.update') -@login_required -def note_update(title: str, body: str)->dict: - """Обновить заметку - """ - note = models.db_session.query( - models.Note - ).filter( - models.Note.id==id - ).first() - if note is None: - raise ValueError - - note.title = title - note.body = body - - result = note.as_dict() - result['user'] = note.user.as_dict() - result['tags'] = [] - for tagLink in note.tags: - result['tags'].append(tagLink.tag.as_dict()) - return result - - @jsonrpc.method('note.add') @login_required def note_add(title: str, body: str)->dict: @@ -91,6 +67,30 @@ def note_destroy(id: int)->bool: return True +@jsonrpc.method('note.update') +@login_required +def note_update(id: int, title: str, body: str)->dict: + """Обновить заметку + """ + note = models.db_session.query( + models.Note + ).filter( + models.Note.id==id + ).first() + if note is None: + raise ValueError + + note.title = title + note.body = body + + result = note.as_dict() + result['user'] = note.user.as_dict() + result['tags'] = [] + for tagLink in note.tags: + result['tags'].append(tagLink.tag.as_dict()) + return result + + @jsonrpc.method('notes') def notes_list(page: int)->list: """Список заметок diff --git a/myapp/ns_api/page.py b/myapp/ns_api/page.py index 5fc81bc..03f8c09 100644 --- a/myapp/ns_api/page.py +++ b/myapp/ns_api/page.py @@ -26,30 +26,6 @@ def page_id(id: int)->dict: return result -@jsonrpc.method('page.update') -@login_required -def page_update(title: str, text: str)->dict: - """Обновить статью - """ - page = models.db_session.query( - models.Page - ).filter( - models.Page.id==id - ).first() - if page is None: - raise ValueError - - page.title = title - page.text = text - - result = page.as_dict() - result['user'] = page.user.as_dict() - result['tags'] = [] - for tagLink in page.tags: - result['tags'].append(tagLink.tag.as_dict()) - return result - - @jsonrpc.method('page.add') @login_required def page_add(title: str, body: str)->dict: @@ -91,6 +67,30 @@ def page_destroy(id: int)->bool: return True +@jsonrpc.method('page.update') +@login_required +def page_update(id: int, title: str, text: str)->dict: + """Обновить статью + """ + page = models.db_session.query( + models.Page + ).filter( + models.Page.id==id + ).first() + if page is None: + raise ValueError + + page.title = title + page.text = text + + result = page.as_dict() + result['user'] = page.user.as_dict() + result['tags'] = [] + for tagLink in page.tags: + result['tags'].append(tagLink.tag.as_dict()) + return result + + @jsonrpc.method('pages') def pages_list(page: int)->list: """Список статей diff --git a/myapp/ns_note/templates/note_edit.html b/myapp/ns_note/templates/note_edit.html index 693becf..388be28 100644 --- a/myapp/ns_note/templates/note_edit.html +++ b/myapp/ns_note/templates/note_edit.html @@ -19,7 +19,7 @@
- +
diff --git a/myapp/ns_page/templates/user/page_add.html b/myapp/ns_page/templates/user/page_add.html index 141e1d2..6f7c274 100644 --- a/myapp/ns_page/templates/user/page_add.html +++ b/myapp/ns_page/templates/user/page_add.html @@ -20,7 +20,7 @@
- +
diff --git a/myapp/ns_page/templates/user/page_edit.html b/myapp/ns_page/templates/user/page_edit.html index af645ad..1c5f56a 100644 --- a/myapp/ns_page/templates/user/page_edit.html +++ b/myapp/ns_page/templates/user/page_edit.html @@ -19,7 +19,7 @@
- +
@@ -27,12 +27,14 @@ {% endblock %} {% block breadcrumb %} +{% raw %}
  2. Страницы
    3. -
  3. {{ pagedata['page'].title }}
    4. +
  4. {{ page.title }}
  5. Редактирование страницы
+{% endraw %} {% endblock %} {% block script %}