From a5b759cff0555f55953473f06b245b6dcf5ef747 Mon Sep 17 00:00:00 2001
From: Johnny <strikax@gmail.com>
Date: Mon, 22 Oct 2018 20:33:56 +0000
Subject: [PATCH] Renames methods to web_get_* and fixes tests.

---
 evennia/accounts/tests.py     |  6 +++---
 evennia/objects/tests.py      |  4 ++--
 evennia/typeclasses/models.py | 24 +++++++-----------------
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/evennia/accounts/tests.py b/evennia/accounts/tests.py
index fbf976d644..be07a30cbd 100644
--- a/evennia/accounts/tests.py
+++ b/evennia/accounts/tests.py
@@ -64,14 +64,14 @@ class TestDefaultAccount(TestCase):
         "Get URL for account detail page on website"
         self.account = create.create_account("TestAccount%s" % randint(100000, 999999),
                 email="test@test.com", password="testpassword", typeclass=DefaultAccount)
-        self.assertTrue(self.account.web_detail_url())
+        self.assertTrue(self.account.web_get_detail_url())
         
     def test_admin_url(self):
         "Get object's URL for access via Admin pane"
         self.account = create.create_account("TestAccount%s" % randint(100000, 999999),
                 email="test@test.com", password="testpassword", typeclass=DefaultAccount)
-        self.assertTrue(self.account.web_admin_url())
-        self.assertTrue(self.account.web_admin_url() != '#')
+        self.assertTrue(self.account.web_get_admin_url())
+        self.assertTrue(self.account.web_get_admin_url() != '#')
 
     def test_password_validation(self):
         "Check password validators deny bad passwords"
diff --git a/evennia/objects/tests.py b/evennia/objects/tests.py
index f317f2c39c..824007f287 100644
--- a/evennia/objects/tests.py
+++ b/evennia/objects/tests.py
@@ -5,7 +5,7 @@ class DefaultObjectTest(EvenniaTest):
     def test_urls(self):
         "Make sure objects are returning URLs"
         self.assertTrue(self.char1.get_absolute_url())
-        self.assertTrue('admin' in self.char1.get_admin_url())
+        self.assertTrue('admin' in self.char1.web_get_admin_url())
         
         self.assertTrue(self.room1.get_absolute_url())
-        self.assertTrue('admin' in self.room1.get_admin_url())
\ No newline at end of file
+        self.assertTrue('admin' in self.room1.web_get_admin_url())
\ No newline at end of file
diff --git a/evennia/typeclasses/models.py b/evennia/typeclasses/models.py
index 098606b53c..d549efb8ff 100644
--- a/evennia/typeclasses/models.py
+++ b/evennia/typeclasses/models.py
@@ -741,7 +741,7 @@ class TypedObject(SharedMemoryModel):
     # Web/Django methods
     #
     
-    def web_admin_url(self):
+    def web_get_admin_url(self):
         """
         Returns the URI path for the Django Admin page for this object.
         
@@ -755,7 +755,7 @@ class TypedObject(SharedMemoryModel):
         return reverse("admin:%s_%s_change" % (content_type.app_label, content_type.model), args=(self.id,))
         
     @classmethod
-    def web_create_url(cls):
+    def web_get_create_url(cls):
         """
         Returns the URI path for a View that allows users to create new
         instances of this object.
@@ -783,7 +783,7 @@ class TypedObject(SharedMemoryModel):
         try: return reverse('%s-create' % cls._meta.verbose_name.lower())
         except: return '#'
         
-    def web_detail_url(self):
+    def web_get_detail_url(self):
         """
         Returns the URI path for a View that allows users to view details for 
         this object.
@@ -811,7 +811,7 @@ class TypedObject(SharedMemoryModel):
         try: return reverse('%s-detail' % self._meta.verbose_name.lower(), kwargs={'pk': self.pk, 'slug': slugify(self.name)})
         except: return '#'
         
-    def web_update_url(self):
+    def web_get_update_url(self):
         """
         Returns the URI path for a View that allows users to update this
         object.
@@ -839,7 +839,7 @@ class TypedObject(SharedMemoryModel):
         try: return reverse('%s-update' % self._meta.verbose_name.lower(), kwargs={'pk': self.pk, 'slug': slugify(self.name)})
         except: return '#'
         
-    def web_delete_url(self):
+    def web_get_delete_url(self):
         """
         Returns the URI path for a View that allows users to delete this object.
         
@@ -866,15 +866,5 @@ class TypedObject(SharedMemoryModel):
         try: return reverse('%s-delete' % self._meta.verbose_name.lower(), kwargs={'pk': self.pk, 'slug': slugify(self.name)})
         except: return '#'
         
-    def get_absolute_url(self):
-        """
-        Django construct; used by Django Sites framework and within the Admin
-        panel for reverse linking to the object detail page. 
-        
-        https://docs.djangoproject.com/en/2.1/ref/models/instances/#get-absolute-url
-        
-        Returns:
-            path (str): URI path to object detail page, if defined.
-            
-        """
-        return self.web_detail_url()
\ No newline at end of file
+    # Used by Django Sites/Admin
+    get_absolute_url = web_get_detail_url
\ No newline at end of file