Skip to content

Commit 3629c00

Browse files
committed
Merge branch 'main' into bugfix/fix_for_is_pk
2 parents be38f64 + 210451e commit 3629c00

6 files changed

Lines changed: 61 additions & 78 deletions

File tree

docs/build.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@ def read_cls_docstring(cls):
3939

4040
def get_versions():
4141
return [
42-
{
43-
"version": "0.2.20",
44-
"changes": [
45-
"Fix for _id fields. Bump packages for backend and frontend.",
46-
],
47-
},
4842
{
4943
"version": "0.2.19",
5044
"changes": [

docs/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<li class="social-icons-twitter"><a data-toggle="tooltip" href="" target="_blank" title="" data-original-title="Twitter"><i class="fab fa-twitter"></i></a></li>
33
<li class="social-icons-facebook"><a data-toggle="tooltip" href="" target="_blank" title="" data-original-title="Facebook"><i class="fab fa-facebook-f"></i></a></li>
44
<li class="social-icons-dribbble"><a data-toggle="tooltip" href="" target="_blank" title="" data-original-title="Dribbble"><i class="fab fa-dribbble"></i></a></li>
5-
--> </ul> </div> </nav> </header> <div id=content role=main> <div class="app-navigation bg-light"> <ul class="nav flex-column"> <li class=nav-item> <a class=nav-link href=#introduction>Introduction</a> </li> <li class=nav-item> <a class=nav-link href=#getting_started>Getting Started</a> <ul class="nav flex-column"> <li class=nav-item> <a class=nav-link href=#installation>Installation</a> </li> <li class=nav-item> <a class=nav-link href=#quick_tutorial>Quick Tutorial</a> </li> </ul> </li> <li class=nav-item> <a class=nav-link href=#settings>Settings</a> </li> <li class=nav-item> <a class=nav-link href=#dashboard-widget-admins>Dashboard Widget Admins</a> <ul class="nav flex-column"> <li class=nav-item> <a class=nav-link href=#registering-widgets>Registering Widgets</a> </li> <li class=nav-item> <a class=nav-link href=#widget-methods-and-attributes>Methods and Attributes</a> </li> <li class=nav-item> <a class=nav-link href=#widget-chart-types>Chart Types</a> </li> </ul> </li> <li class=nav-item> <a class=nav-link href=#model-admins>Model Admins</a> <ul class="nav flex-column"> <li class=nav-item> <a class=nav-link href=#registering-models>Registering Models</a> </li> <li class=nav-item> <a class=nav-link href=#authentication>Authentication</a> </li> <li class=nav-item> <a class=nav-link href=#model-methods-and-attributes>Methods and Attributes</a> </li> <li class=nav-item> <a class=nav-link href=#model-form-field-types>Form Field Types</a> </li> </ul> </li> <li class=nav-item> <a class=nav-link href=#inline-admins>Inline Model Admins</a> <ul class="nav flex-column"> <li class=nav-item> <a class=nav-link href=#registering-inlines>Registering Inlines</a> </li> <li class=nav-item> <a class=nav-link href=#inline-methods-and-attributes>Methods and Attributes</a> </li> </ul> </li> <li class=nav-item> <a class=nav-link href=#changelog>Changelog</a> <ul class="nav flex-column"> <li class=nav-item> <a class=nav-link href=#v0_2_20>v0.2.20</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_19>v0.2.19</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_18>v0.2.18</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_17>v0.2.17</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_16>v0.2.16</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_15>v0.2.15</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_14>v0.2.14</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_13>v0.2.13</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_12>v0.2.12</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_11>v0.2.11</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_10>v0.2.10</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_9>v0.2.9</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_8>v0.2.8</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_7>v0.2.7</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_6>v0.2.6</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_5>v0.2.5</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_4>v0.2.4</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_3>v0.2.3</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_2>v0.2.2</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_1>v0.2.1</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_0>v0.2.0</a> </li> </ul> </li> </ul> </div> <div class=app-content> <div class=container> <section id=index> <h1>FastAdmin | Documentation</h1> <div class=row> <div class="col-sm-6 col-lg-4"> <ul class=list-unstyled> <li><strong>Version:</strong> 0.2.20</li> <li> <strong>Author:</strong> <a href=mailto:vsdudakov@gmail.com target=_blank> Seva D. </a> </li> </ul> </div> <div class="col-sm-6 col-lg-4"> <ul class=list-unstyled> <li> <strong class=font-weight-700>Created:</strong> 7 March 2023 </li> <li> <strong>Updated:</strong> 15 April 2025 </li> </ul> </div> </div> </section> <hr class=divider> <section id=introduction> <h2>Introduction</h2> <p class=text-4> <a href=https://github.com/vsdudakov/fastadmin target=_blank>FastAdmin</a> is an easy-to-use Admin Dashboard App for FastAPI/Django/Flask inspired by Django Admin. </p> <p class=text-4> FastAdmin was built with relations in mind and admiration for the excellent and popular Django Admin. It's engraved in its design that you may configure your admin dashboard for FastAPI/Django/Flask easiest way. </p> <p class=text-4> FastAdmin is designed to be minimalistic, functional and yet familiar. </p> </section> <hr class=small-divider> <section id=getting_started> <h2>Getting Started</h2> <p class="alert alert-info"> If you have any questions that are beyond the scope of the documentation, Please feel free to email <a href=mailto:vsdudakov@gmail.com target=_blank>us</a>. </p> <section id=installation> <h3>Installation</h3> <p class=lead> Follow the steps below to setup FastAdmin: </p> <p class=text-4> Install the package using pip: </p> <p class="alert alert-info"> Note: For zsh and macos use: <code>pip install fastadmin[fastapi,django]</code> </p> <pre>
5+
--> </ul> </div> </nav> </header> <div id=content role=main> <div class="app-navigation bg-light"> <ul class="nav flex-column"> <li class=nav-item> <a class=nav-link href=#introduction>Introduction</a> </li> <li class=nav-item> <a class=nav-link href=#getting_started>Getting Started</a> <ul class="nav flex-column"> <li class=nav-item> <a class=nav-link href=#installation>Installation</a> </li> <li class=nav-item> <a class=nav-link href=#quick_tutorial>Quick Tutorial</a> </li> </ul> </li> <li class=nav-item> <a class=nav-link href=#settings>Settings</a> </li> <li class=nav-item> <a class=nav-link href=#dashboard-widget-admins>Dashboard Widget Admins</a> <ul class="nav flex-column"> <li class=nav-item> <a class=nav-link href=#registering-widgets>Registering Widgets</a> </li> <li class=nav-item> <a class=nav-link href=#widget-methods-and-attributes>Methods and Attributes</a> </li> <li class=nav-item> <a class=nav-link href=#widget-chart-types>Chart Types</a> </li> </ul> </li> <li class=nav-item> <a class=nav-link href=#model-admins>Model Admins</a> <ul class="nav flex-column"> <li class=nav-item> <a class=nav-link href=#registering-models>Registering Models</a> </li> <li class=nav-item> <a class=nav-link href=#authentication>Authentication</a> </li> <li class=nav-item> <a class=nav-link href=#model-methods-and-attributes>Methods and Attributes</a> </li> <li class=nav-item> <a class=nav-link href=#model-form-field-types>Form Field Types</a> </li> </ul> </li> <li class=nav-item> <a class=nav-link href=#inline-admins>Inline Model Admins</a> <ul class="nav flex-column"> <li class=nav-item> <a class=nav-link href=#registering-inlines>Registering Inlines</a> </li> <li class=nav-item> <a class=nav-link href=#inline-methods-and-attributes>Methods and Attributes</a> </li> </ul> </li> <li class=nav-item> <a class=nav-link href=#changelog>Changelog</a> <ul class="nav flex-column"> <li class=nav-item> <a class=nav-link href=#v0_2_19>v0.2.19</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_18>v0.2.18</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_17>v0.2.17</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_16>v0.2.16</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_15>v0.2.15</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_14>v0.2.14</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_13>v0.2.13</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_12>v0.2.12</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_11>v0.2.11</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_10>v0.2.10</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_9>v0.2.9</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_8>v0.2.8</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_7>v0.2.7</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_6>v0.2.6</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_5>v0.2.5</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_4>v0.2.4</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_3>v0.2.3</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_2>v0.2.2</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_1>v0.2.1</a> </li> <li class=nav-item> <a class=nav-link href=#v0_2_0>v0.2.0</a> </li> </ul> </li> </ul> </div> <div class=app-content> <div class=container> <section id=index> <h1>FastAdmin | Documentation</h1> <div class=row> <div class="col-sm-6 col-lg-4"> <ul class=list-unstyled> <li><strong>Version:</strong> 0.2.19</li> <li> <strong>Author:</strong> <a href=mailto:vsdudakov@gmail.com target=_blank> Seva D. </a> </li> </ul> </div> <div class="col-sm-6 col-lg-4"> <ul class=list-unstyled> <li> <strong class=font-weight-700>Created:</strong> 7 March 2023 </li> <li> <strong>Updated:</strong> 15 April 2025 </li> </ul> </div> </div> </section> <hr class=divider> <section id=introduction> <h2>Introduction</h2> <p class=text-4> <a href=https://github.com/vsdudakov/fastadmin target=_blank>FastAdmin</a> is an easy-to-use Admin Dashboard App for FastAPI/Django/Flask inspired by Django Admin. </p> <p class=text-4> FastAdmin was built with relations in mind and admiration for the excellent and popular Django Admin. It's engraved in its design that you may configure your admin dashboard for FastAPI/Django/Flask easiest way. </p> <p class=text-4> FastAdmin is designed to be minimalistic, functional and yet familiar. </p> </section> <hr class=small-divider> <section id=getting_started> <h2>Getting Started</h2> <p class="alert alert-info"> If you have any questions that are beyond the scope of the documentation, Please feel free to email <a href=mailto:vsdudakov@gmail.com target=_blank>us</a>. </p> <section id=installation> <h3>Installation</h3> <p class=lead> Follow the steps below to setup FastAdmin: </p> <p class=text-4> Install the package using pip: </p> <p class="alert alert-info"> Note: For zsh and macos use: <code>pip install fastadmin[fastapi,django]</code> </p> <pre>
66
<code class=language-bash>
77

88
pip install fastadmin[fastapi,django] # for fastapi with django orm
@@ -1304,7 +1304,7 @@
13041304
min_num: int = 1
13051305

13061306
</code>
1307-
</pre> </section> </section> <hr class=small-divider> <section id=changelog> <h2>Changelog</h2> <p class="alert alert-info"> See what's new added, changed, fixed, improved or updated in the latest versions. </p> <section id=v0_2_20> <h3>v0.2.20</h3> <p class=text-4> Fix for _id fields. Bump packages for backend and frontend. </p> </section> <section id=v0_2_19> <h3>v0.2.19</h3> <p class=text-4> Fix for is_pk for tortoise orm. </p> </section> <section id=v0_2_18> <h3>v0.2.18</h3> <p class=text-4> Fixes for m2m fk's sqlalchemy postgres. Convert str to int for them. </p> </section> <section id=v0_2_17> <h3>v0.2.17</h3> <p class=text-4> Fixes for fk sqlalchemy postgres. Convert str to int for them. </p> </section> <section id=v0_2_16> <h3>v0.2.16</h3> <p class=text-4> Added new setting ADMIN_DISABLE_CROP_IMAGE. So,we can configure crop images on upload. </p> </section> <section id=v0_2_15> <h3>v0.2.15</h3> <p class=text-4> Fix password logic for user. </p> </section> <section id=v0_2_14> <h3>v0.2.14</h3> <p class=text-4> Make permissions functions awaitable. Bump frontend/backend packages. </p> </section> <section id=v0_2_13> <h3>v0.2.13</h3> <p class=text-4> Fix edit page frontend issue for Date field. </p> </section> <section id=v0_2_12> <h3>v0.2.12</h3> <p class=text-4> Remove python-dotenv dep. Bump django. Add django example. </p> </section> <section id=v0_2_11> <h3>v0.2.11</h3> <p class=text-4> Fixes for examples. Fixes for Pony ORM (delete, update m2m). Allow sorting by custom columns. Fix for list_display ordering. </p> </section> <section id=v0_2_10> <h3>v0.2.10</h3> <p class=text-4> Fix issue empty m2m. Optimisation on unit tests. Fix for pony orm. Optimisation on search for tortoise orm. </p> </section> <section id=v0_2_9> <h3>v0.2.9</h3> <p class=text-4> Fix issue with modal inline dialogs. Fix issue with m2m multiple select. </p> </section> <section id=v0_2_8> <h3>v0.2.8</h3> <p class=text-4> Fix sqlalchemy delete functionality. Add more examples. </p> </section> <section id=v0_2_7> <h3>v0.2.7</h3> <p class=text-4> Fix helpers function. Add regexps. </p> </section> <section id=v0_2_6> <h3>v0.2.6</h3> <p class=text-4> Add edit btn for async select. </p> </section> <section id=v0_2_5> <h3>v0.2.5</h3> <p class=text-4> Fix for async select in inlines. </p> </section> <section id=v0_2_4> <h3>v0.2.4</h3> <p class=text-4> Fix dashboard widgets and auto register inlines. </p> </section> <section id=v0_2_3> <h3>v0.2.3</h3> <p class=text-4> Fix filters issue on lists. Remove jinja from dependencies. </p> </section> <section id=v0_2_2> <h3>v0.2.2</h3> <p class=text-4> Fix bugs with datetime. </p> </section> <section id=v0_2_1> <h3>v0.2.1</h3> <p class=text-4> Update packages. Fix linters and tests in vite frontend. Removed pydantic from dependencies. </p> </section> <section id=v0_2_0> <h3>v0.2.0</h3> <p class=text-4> Update packages. Use vite instead obsolete react-scripts. </p> </section> </section> <hr class=small-divider> </div> </div> </div> <footer id=footer class="section bg-dark footer-text-light"> <div class=container> <!--
1307+
</pre> </section> </section> <hr class=small-divider> <section id=changelog> <h2>Changelog</h2> <p class="alert alert-info"> See what's new added, changed, fixed, improved or updated in the latest versions. </p> <section id=v0_2_19> <h3>v0.2.19</h3> <p class=text-4> Fix for is_pk for tortoise orm. </p> </section> <section id=v0_2_18> <h3>v0.2.18</h3> <p class=text-4> Fixes for m2m fk's sqlalchemy postgres. Convert str to int for them. </p> </section> <section id=v0_2_17> <h3>v0.2.17</h3> <p class=text-4> Fixes for fk sqlalchemy postgres. Convert str to int for them. </p> </section> <section id=v0_2_16> <h3>v0.2.16</h3> <p class=text-4> Added new setting ADMIN_DISABLE_CROP_IMAGE. So,we can configure crop images on upload. </p> </section> <section id=v0_2_15> <h3>v0.2.15</h3> <p class=text-4> Fix password logic for user. </p> </section> <section id=v0_2_14> <h3>v0.2.14</h3> <p class=text-4> Make permissions functions awaitable. Bump frontend/backend packages. </p> </section> <section id=v0_2_13> <h3>v0.2.13</h3> <p class=text-4> Fix edit page frontend issue for Date field. </p> </section> <section id=v0_2_12> <h3>v0.2.12</h3> <p class=text-4> Remove python-dotenv dep. Bump django. Add django example. </p> </section> <section id=v0_2_11> <h3>v0.2.11</h3> <p class=text-4> Fixes for examples. Fixes for Pony ORM (delete, update m2m). Allow sorting by custom columns. Fix for list_display ordering. </p> </section> <section id=v0_2_10> <h3>v0.2.10</h3> <p class=text-4> Fix issue empty m2m. Optimisation on unit tests. Fix for pony orm. Optimisation on search for tortoise orm. </p> </section> <section id=v0_2_9> <h3>v0.2.9</h3> <p class=text-4> Fix issue with modal inline dialogs. Fix issue with m2m multiple select. </p> </section> <section id=v0_2_8> <h3>v0.2.8</h3> <p class=text-4> Fix sqlalchemy delete functionality. Add more examples. </p> </section> <section id=v0_2_7> <h3>v0.2.7</h3> <p class=text-4> Fix helpers function. Add regexps. </p> </section> <section id=v0_2_6> <h3>v0.2.6</h3> <p class=text-4> Add edit btn for async select. </p> </section> <section id=v0_2_5> <h3>v0.2.5</h3> <p class=text-4> Fix for async select in inlines. </p> </section> <section id=v0_2_4> <h3>v0.2.4</h3> <p class=text-4> Fix dashboard widgets and auto register inlines. </p> </section> <section id=v0_2_3> <h3>v0.2.3</h3> <p class=text-4> Fix filters issue on lists. Remove jinja from dependencies. </p> </section> <section id=v0_2_2> <h3>v0.2.2</h3> <p class=text-4> Fix bugs with datetime. </p> </section> <section id=v0_2_1> <h3>v0.2.1</h3> <p class=text-4> Update packages. Fix linters and tests in vite frontend. Removed pydantic from dependencies. </p> </section> <section id=v0_2_0> <h3>v0.2.0</h3> <p class=text-4> Update packages. Use vite instead obsolete react-scripts. </p> </section> </section> <hr class=small-divider> </div> </div> </div> <footer id=footer class="section bg-dark footer-text-light"> <div class=container> <!--
13081308
<ul class="social-icons social-icons-lg social-icons-muted justify-content-center mb-3">
13091309
<li><a data-toggle="tooltip" href="https://twitter.com/harnishdesign/" target="_blank" title="" data-original-title="Twitter"><i class="fab fa-twitter"></i></a></li>
13101310
<li><a data-toggle="tooltip" href="http://www.facebook.com/harnishdesign/" target="_blank" title="" data-original-title="Facebook"><i class="fab fa-facebook-f"></i></a></li>

fastadmin/models/orms/tortoise.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def get_model_fields_with_widget_types(
4343
if field_type in ("BackwardFKRelation", "BackwardOneToOneRelation"):
4444
continue
4545

46-
if field_name.endswith("_id") and hasattr(orm_model_field, "reference"):
46+
if field_name.endswith("_id") and getattr(orm_model_field, "reference", False):
4747
# ignore _id fields for relations
4848
continue
4949

0 commit comments

Comments
 (0)