Implements base.Logic functions in home_settings, site_settings and work This patch implements the base.Logic funtions needed for making logic/key_name.py obsolete. This patch defines the needed functions in home_settings, site_settings and work. All modules in logic/models now have these functions defined. logic/models/site_settings.py now inherits from logic/models/home_settings.py because of their similar connection in the corresponding models. Please note that the self._keyName for these two modules still points to logic/key_name.py since entity_type is still used in views/home.py. A partial_path and link_name were added to HomeSettings as requested by SRabbelier.

     1

from django.db.backends import BaseDatabaseClient

     2

from django.conf import settings

     3

import os

     4

     5

class DatabaseClient(BaseDatabaseClient):

     6

    executable_name = 'psql'

     7

     8

    def runshell(self):

     9

        args = [self.executable_name]

    10

        if settings.DATABASE_USER:

    11

            args += ["-U", settings.DATABASE_USER]

    12

        if settings.DATABASE_PASSWORD:

    13

            args += ["-W"]

    14

        if settings.DATABASE_HOST:

    15

            args.extend(["-h", settings.DATABASE_HOST])

    16

        if settings.DATABASE_PORT:

    17

            args.extend(["-p", str(settings.DATABASE_PORT)])

    18

        args += [settings.DATABASE_NAME]

    19

        os.execvp(self.executable_name, args)