Просмотр исходного кода

Fixes #12112: Do not link data source URL for local paths

jeremystretch 2 лет назад
Родитель
Сommit
730eb2e83b

+ 1 - 0
docs/release-notes/version-3.5.md

@@ -71,6 +71,7 @@ Two new webhook trigger events have been introduced: `job_start` and `job_end`.
 ### Bug Fixes (From Beta1)
 
 * [#12109](https://github.com/netbox-community/netbox/issues/12109) - Fix migration error when replicating more than 100 job results
+* [#12112](https://github.com/netbox-community/netbox/issues/12112) - Do not link data source URL for local paths
 
 ### Other Changes
 

+ 4 - 0
netbox/core/models/data.py

@@ -95,6 +95,10 @@ class DataSource(JobsMixin, PrimaryModel):
     def url_scheme(self):
         return urlparse(self.source_url).scheme.lower()
 
+    @property
+    def is_local(self):
+        return self.type == DataSourceTypeChoices.LOCAL
+
     @property
     def ready_for_sync(self):
         return self.enabled and self.status not in (

+ 1 - 1
netbox/templates/core/datafile.html

@@ -33,7 +33,7 @@
           <table class="table table-hover attr-table">
             <tr>
               <th scope="row">Source</th>
-              <td><a href="{{ object.source.get_absolute_url }}">{{ object.source }}</a></td>
+              <td>{{ object.source|linkify }}</td>
             </tr>
             <tr>
               <th scope="row">Path</th>

+ 5 - 1
netbox/templates/core/datasource.html

@@ -57,7 +57,11 @@
             <tr>
               <th scope="row">URL</th>
               <td>
-                <a href="{{ object.source_url }}">{{ object.source_url }}</a>
+                {% if not object.is_local %}
+                  <a href="{{ object.source_url }}">{{ object.source_url }}</a>
+                {% else %}
+                  {{ object.source_url }}
+                {% endif %}
               </td>
             </tr>
             <tr>