-
-
Notifications
You must be signed in to change notification settings - Fork 26
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merging djreservation with gentelella #74
base: reservations
Are you sure you want to change the base?
Conversation
<link rel="stylesheet" type="text/css" media="screen" | ||
href="{% static 'css/bootstrap-datetimepicker.min.css' %}"> | ||
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" | ||
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Esto hay que eliminarlo, ya que djgentelella tiene iconos incorpoados de la versión 4
datepiker también forma parte de gentelella.
@@ -9,7 +9,7 @@ | |||
<div class="panel-heading" role="tab" id="headingOne"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Esto debería utilizar un tabla de gentelella, para esta primera etapa está ok, pero en la siguiente hay que cambia para que se conecte a un api
kwargs['initial']['reserved_end_date'] = END_RESERVATION_DATETIME | ||
if START_RESERVATION_DATETIME: | ||
if settings.END_RESERVATION_DATETIME: | ||
kwargs['initial']['reserved_end_date'] = settings.END_RESERVATION_DATETIME |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fecha actual?
|
||
{% block form_start %}{% endblock %} | ||
|
||
<div class="form-group"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sería mejor un {{form.as_horizontal }} ??
@@ -61,7 +63,7 @@ | |||
TEMPLATES = [ | |||
{ | |||
'BACKEND': 'django.template.backends.django.DjangoTemplates', | |||
'DIRS': [os.path.join(BASE_DIR, 'demo/templates/')], | |||
'DIRS': [os.path.join(BASE_DIR, 'demo/templates/', 'djgentelella/reservation/templates')], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No puso la app en installed apps por eso es que no le reconoce las plantillas.
@@ -140,3 +142,19 @@ | |||
'use_readonlywidgets': True, | |||
'use_flags': True | |||
} | |||
|
|||
TOKENIZE = getattr(settings, 'DJRESERVATION_TOKENIZE', False) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
el objecto settings de djreservation tiene sentido, acá la variable settings no existe, además que fuerza al usuario a siempre poner esos settings y eso no es deseado
Remove files are not using, move code to demo module, update routes and forms of reservations module and fix the problem to up gentelella in python 3.10 *