Django

Code

Changeset 2925

Show
Ignore:
Timestamp:
05/16/06 16:07:14 (2 years ago)
Author:
jkocherhans
Message:

multi-auth: Merged to [2924]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/multi-auth/django/db/backends/mysql/introspection.py

    r2809 r2925  
    8888    FIELD_TYPE.STRING: 'TextField', 
    8989    FIELD_TYPE.TIMESTAMP: 'DateTimeField', 
     90    FIELD_TYPE.TINY: 'IntegerField', 
    9091    FIELD_TYPE.TINY_BLOB: 'TextField', 
    9192    FIELD_TYPE.MEDIUM_BLOB: 'TextField', 
  • django/branches/multi-auth/docs/tutorial02.txt

    r2809 r2925  
    7272 
    7373Just one thing to do: We need to specify in the ``Poll`` model that ``Poll`` 
    74 objects have an admin interface. Edit the ``mysite/polls/models/polls.py`` 
    75 file and make the following change to add an inner ``Admin`` class:: 
     74objects have an admin interface. Edit the ``mysite/polls/models.py`` file and 
     75make the following change to add an inner ``Admin`` class:: 
    7676 
    7777    class Poll(models.Model): 
  • django/branches/multi-auth/docs/tutorial03.txt

    r2921 r2925  
    9292pattern "captures" the text matched by that pattern and sends it as an argument 
    9393to the view function; the ``?P<poll_id>`` defines the name that will be used to 
    94 identify the matched pattern; and \d+ is a regular experession to match a sequence of 
     94identify the matched pattern; and ``\d+`` is a regular experession to match a sequence of 
    9595digits (i.e., a number). 
    9696 
  • django/branches/multi-auth/docs/tutorial04.txt

    r2809 r2925  
    219219 
    220220The ``vote()`` view is still required. However, it must be modified to match 
    221 the new templates and context variables. Change the template call from ``polls/detail`` 
    222 to ``polls/polls_detail``, and pass ``object`` in the context instead of ``poll``. 
     221the new templates and context variables. Change the template call from 
     222``polls/detail.html`` to ``polls/poll_detail.html``, and pass ``object`` in the 
     223context instead of ``poll``. 
    223224 
    224225Run the server, and use your new polling app based on generic views.