[jarun#564] added hyperlinks to create & edit success messages

bukuserver/static/bukuserver/js/flash.js

@@ -0,0 +1,4 @@
+$(document).ready(function () {
+  SAVED && $(`.alert-success`).first().html((_, s) =>
+    s.replace(/(<\/button>)([^]*)$/, `$1<a href="details?id=${SAVED}">$2</a>`));
+});

bukuserver/templates/bukuserver/bookmark_create.html

@@ -1,5 +1,10 @@
 {% extends 'admin/model/create.html' %}
 
+{% block head %}
+  {{ super() }}
+  <script>const SAVED = '{{ session.pop('saved', '') }}'</script>
+{% endblock %}
+
 {% block tail %}
   {{ super() }}
   <script src="{{ url_for('static', filename='bukuserver/js/bookmark.js') }}"></script>

bukuserver/templates/bukuserver/bookmark_details.html

@@ -0,0 +1,6 @@
+{% extends 'admin/model/details.html' %}
+
+{% block head %}
+  {{ super() }}
+  <script>const SAVED = '{{ session.pop('saved', '') }}'</script>
+{% endblock %}

bukuserver/templates/bukuserver/bookmark_edit.html

@@ -1,5 +1,10 @@
 {% extends 'admin/model/edit.html' %}
 
+{% block head %}
+  {{ super() }}
+  <script>const SAVED = '{{ session.pop('saved', '') }}'</script>
+{% endblock %}
+
 {% block tail %}
   {{ super() }}
   <script src="{{ url_for('static', filename='bukuserver/js/bookmark.js') }}"></script>

bukuserver/templates/bukuserver/bookmarks_list.html

@@ -0,0 +1,6 @@
+{% extends 'admin/model/list.html' %}
+
+{% block head %}
+  {{ super() }}
+  <script>const SAVED = '{{ session.pop('saved', '') }}'</script>
+{% endblock %}

bukuserver/views.py

@@ -10,7 +10,7 @@
 
 import arrow
 import wtforms
-from flask import current_app, flash, redirect, request, url_for
+from flask import current_app, flash, redirect, request, session, url_for
 from flask_admin.babel import gettext
 from flask_admin.base import AdminIndexView, BaseView, expose
 from flask_admin.model import BaseModelView
@@ -153,6 +153,8 @@ def _list_entry(self, context: Any, model: Namespace, name: str) -> Markup:
         "Entry": _list_entry,
     }
     column_list = ["Entry"]
+    list_template = 'bukuserver/bookmarks_list.html'
+    details_template = 'bukuserver/bookmark_details.html'
     create_modal = True
     create_modal_template = "bukuserver/bookmark_create_modal.html"
     create_template = "bukuserver/bookmark_create.html"
@@ -162,7 +164,7 @@ def _list_entry(self, context: Any, model: Namespace, name: str) -> Markup:
     edit_template = "bukuserver/bookmark_edit.html"
     named_filter_urls = True
     extra_css = ['/static/bukuserver/css/bookmark.css']
-    extra_js = ['/static/bukuserver/js/' + it for it in ('page_size.js', 'last_page.js')]
+    extra_js = ['/static/bukuserver/js/' + it for it in ('page_size.js', 'last_page.js', 'flash.js')]
     last_page = expose('/last-page')(last_page)
 
     def __init__(self, *args, **kwargs):
@@ -202,7 +204,7 @@ def create_model(self, form):
             for key, item in (("title_in", model.title), ("desc", model.description)):
                 if item.strip():
                     kwargs[key] = item
-            vars(model)['id'] = self.model.bukudb.add_rec(**kwargs)
+            session['saved'] = vars(model)['id'] = self.model.bukudb.add_rec(**kwargs)
         except Exception as ex:
             if not self.handle_view_exception(ex):
                 msg = "Failed to create record."
@@ -272,6 +274,7 @@ def get_one(self, id):
         bookmark = self.model.bukudb.get_rec_by_id(id)
         bm_sns = types.SimpleNamespace(id=None, url=None, title=None, tags=None, description=None)
         for field in list(BookmarkField):
+            print(field)
             if field == BookmarkField.TAGS and bookmark[field.value].startswith(","):
                 value = bookmark[field.value]
                 if value.startswith(","):
@@ -409,6 +412,8 @@ def update_model(self, form: forms.BookmarkForm, model: Namespace):
                 tags_in=buku.parse_tags([model.tags]),
                 desc=model.description,
             )
+            print(model.id)
+            session['saved'] = model.id
         except Exception as ex:
             if not self.handle_view_exception(ex):
                 msg = "Failed to update record."