lesscode-flask 0.2.1__tar.gz → 0.2.3__tar.gz

{lesscode_flask-0.2.1 → lesscode_flask-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.2.1
+Version: 0.2.3
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

{lesscode_flask-0.2.1 → lesscode_flask-0.2.3}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.2.1'
+__version__ = '0.2.3'
 
 import functools
 import logging

{lesscode_flask-0.2.1 → lesscode_flask-0.2.3}/lesscode_flask/service/base_service.py

@@ -31,9 +31,9 @@ class BaseService:
         # except AttributeError:
         #     current_user = None
         try:
-            if hasattr(item, "create_user_id"):
+            if hasattr(item, "create_user_id") and not getattr(item, "create_user_id"):
                 item.create_user_id = flask_login.current_user.id
-            if hasattr(item, "create_user_name"):
+            if hasattr(item, "create_user_name") and not getattr(item, "create_user_name"):
                 item.create_user_name = flask_login.current_user.display_name
         except Exception as e:
             if hasattr(item, "create_user_id"):
@@ -52,9 +52,9 @@ class BaseService:
         """
         for item in items:
             try:
-                if hasattr(item, "create_user_id"):
+                if hasattr(item, "create_user_id") and not getattr(item, "create_user_id"):
                     item.create_user_id = flask_login.current_user.id
-                if hasattr(item, "create_user_name"):
+                if hasattr(item, "create_user_name") and not getattr(item, "create_user_name"):
                     item.create_user_name = flask_login.current_user.display_name
             except Exception as e:
                 if hasattr(item, "create_user_id"):
@@ -73,9 +73,9 @@ class BaseService:
     def update_item(self, id: str, item: dict):
 
         try:
-            if hasattr(self.model, "modify_user_id"):
+            if hasattr(self.model, "modify_user_id") and not getattr(self.model, "modify_user_id"):
                 item["modify_user_id"] = flask_login.current_user.id
-            if hasattr(self.model, "modify_user_name"):
+            if hasattr(self.model, "modify_user_name") and not getattr(self.model, "modify_user_name"):
                 item["modify_user_name"] = flask_login.current_user.display_name
         except Exception as e:
             if hasattr(item, "modify_user_id"):
@@ -89,9 +89,9 @@ class BaseService:
     def update_items(self, filters: list, item: dict):
 
         try:
-            if hasattr(self.model, "modify_user_id"):
+            if hasattr(self.model, "modify_user_id") and not getattr(self.model, "modify_user_id"):
                 item["modify_user_id"] = flask_login.current_user.id
-            if hasattr(self.model, "modify_user_name"):
+            if hasattr(self.model, "modify_user_name") and not getattr(self.model, "modify_user_name"):
                 item["modify_user_name"] = flask_login.current_user.display_name
         except Exception as e:
             if hasattr(item, "modify_user_id"):

{lesscode_flask-0.2.1 → lesscode_flask-0.2.3}/lesscode_flask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.2.1
+Version: 0.2.3
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

{lesscode_flask-0.2.1 → lesscode_flask-0.2.3}/redash/query_runner/__init__.py

@@ -215,7 +215,10 @@ class BaseQueryRunner:
             return query
 
         annotation = ", ".join(["{}: {}".format(k, v) for k, v in metadata.items()])
-        annotated_query = "/* {} */ {}".format(annotation, query)
+        if annotation:
+            annotated_query = "/* {} */ {}".format(annotation, query)
+        else:
+            annotated_query = query
         return annotated_query
 
     def test_connection(self):