Skip to content

master deploy#234

Closed
tapaswenipathak wants to merge 3 commits into
masterfrom
predev
Closed

master deploy#234
tapaswenipathak wants to merge 3 commits into
masterfrom
predev

Conversation

@tapaswenipathak

Copy link
Copy Markdown
Member

Checklist

  • My branch is up-to-date with the upstream predev branch.
  • I have added necessary documentation (if appropriate).

Which issue does this PR fix?: fixes #

Brief description of what this PR does.
Add issue number here. If you do not solve the issue entirely, please change the message e.g. "First steps for issues #IssueNumber"

Why do we need this PR?:

If relevant, please include a screenshot.

Demo (optional):

Some tips for you to write the instructions:

  • Prefer bulleted description
  • Start after checking out this branch
  • Include any setup required, such as migrating databases, etc.

Testing instructions:

If there is any work still left to do, please add it here.

TODOs (if any):

A picture of a cute animal (not mandatory but encouraged):

* list all chat sessions

* migration and fixes

* aah migrations issues
Comment thread oshc/main/views.py
return render(request, 'journey.html', context={'Journey': journey_list})



Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

blank line contains whitespace

Comment thread oshc/main/views.py

def handler404(request):
response = render_to_response('404.html', {},
context_instance=RequestContext(request))

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

undefined name 'RequestContext'

Comment thread oshc/main/views.py


def handler404(request):
response = render_to_response('404.html', {},

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

undefined name 'render_to_response'

Comment thread oshc/main/views.py
def submit_contest(request):
return render(request, 'contest_submission.html')

def chat_sessions(request):

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

expected 2 blank lines, found 1

Comment thread oshc/main/models.py
profile_name = models.CharField(
max_length=128, help_text="The person's name")
<<<<<<< issue1
name = models.CharField(max_length=128, help_text="Session title")

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unexpected indentation

Comment thread oshc/main/models.py
title = models.CharField(max_length=128, help_text="Session title")
profile_name = models.CharField(
max_length=128, help_text="The person's name")
<<<<<<< issue1

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IndentationError: expected an indented block
expected 2 blank lines after class or function definition, found 0
expected an indented block
missing whitespace around bitwise or shift operator
missing whitespace around operator

('profile_name', models.CharField(help_text="The person's name",
max_length=128)),
('profile_url', models.URLField(help_text="The Url of the " +
"person's website")),

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

continuation line over-indented for visual indent
line too long (80 > 79 characters)

serialize=False, verbose_name='ID')),
('name', models.CharField(help_text='Session title',
max_length=128)),
('profile_name', models.CharField(help_text="The person's name",

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

line too long (80 > 79 characters)

('id', models.AutoField(auto_created=True, primary_key=True,
serialize=False, verbose_name='ID')),
('name', models.CharField(help_text='Session title',
max_length=128)),

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

continuation line under-indented for visual indent

max_length=512)),

('id', models.AutoField(auto_created=True, primary_key=True,
serialize=False, verbose_name='ID')),

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

continuation line under-indented for visual indent

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants