user stuff is finished

Author: mrWinston

metaSearch/mainApp/JoinForm.py

@@ -8,8 +8,8 @@ class Meta:
       fields = []  # Excluding updated_at and created_at as the property 'auto_now_add=True'
       # makes them read-only, resulting in an error when adding them to this form.
       for f in Project._meta.get_fields():
-         if f.name != 'updated_at' and f.name != 'created_at':
+         if f.name != 'updated_at' and f.name != 'created_at' and f.name!='contact_loc' and f.name!='geo_location':
             fields.append(f.name)
 
-   contact_loc = CharField(max_length=200, required=True)
-   geo_location = CharField(max_length=200, required=True)
+   contact_loc = CharField(max_length=200, required=False)
+   geo_location = CharField(max_length=200, required=False)

metaSearch/mainApp/forms.py

@@ -0,0 +1,32 @@
+from django import forms
+from django.contrib.auth.models import User   # fill in custom user info then save it
+from django.contrib.auth.forms import UserCreationForm
+
+class MyRegistrationForm(UserCreationForm):
+    email = forms.EmailField(required = True)
+    first_name = forms.CharField(required = False)
+    last_name = forms.CharField(required = False)
+
+
+
+    class Meta:
+        model = User
+        fields = ('username', 'email', 'password1', 'password2')
+
+    def save(self,commit = True):
+        user = super(MyRegistrationForm, self).save(commit = False)
+        user.email = self.cleaned_data['email']
+        user.first_name = self.cleaned_data['first_name']
+        user.last_name = self.cleaned_data['last_name']
+
+
+        if commit:
+            user.save()
+
+        return user
+
+class UpdateProfile(forms.ModelForm):
+    class Meta:
+        model = User
+        fields = ['username', 'email']
+

metaSearch/mainApp/management/commands/load_csv_data.py

@@ -4,6 +4,8 @@
 from mainApp import models
 from mainApp.models import Project, Category, ProgrammingLanguage, PageLanguage, Kind, GeoLocation
 from django.core.exceptions import ObjectDoesNotExist
+from django.contrib.auth.models import Group
+from guardian.shortcuts import assign_perm
 
 
 # 0  id
@@ -151,6 +153,12 @@ def handle(self, *args, **options):
         print("Initializing Categories")
         self.init_categories()
         print("Initializing Projects")
+
+        #group of users, which are allowed to edit each project
+        editors, created = Group.objects.get_or_create(name='editors')
+        if created:
+            editors.save()
+
         csvReader = csv.reader(getProjectCsvData().split('\n'), delimiter=',')
         first_line= csvReader.__next__() # skip the first row, because these are the column names
         print(first_line)
@@ -307,6 +315,9 @@ def handle(self, *args, **options):
                                     if currentCat.parent != None and len(newPro.categories.all().filter(pk=currentCat.parent.pk)) == 0:
                                         newPro.categories.add(currentCat.parent)
 
+
+                assign_perm('change_project', editors, newPro)
+
                 newPro.save()
             else:
                 print("GOT NO TITLE in Project id:  " + row[0] )

metaSearch/mainApp/models.py

@@ -7,6 +7,8 @@
 from django.db.models.signals import pre_save
 from geopy.geocoders import Nominatim
 from django.core.urlresolvers import reverse
+from django.contrib.auth.models import User
+
 
 import time
 
@@ -143,7 +145,7 @@ class Project(models.Model):
     kind = models.ManyToManyField(Kind)
     organisation_name = models.CharField(max_length=200, blank=True, default='')
     categories = models.ManyToManyField(Category)
-
+    created_by = models.ForeignKey(User, blank=True, null=True)
     description_de = models.TextField()
     description_en = models.TextField(blank = True, default='')
     description_fr = models.TextField(blank = True, default='')

metaSearch/mainApp/templates/mainApp/base.html metaSearch/mainApp/templates/base.html

@@ -77,13 +77,13 @@
                 <span class="caret"></span>
               </button>
               <ul class="dropdown-menu" aria-labelledby="userLoggedInDropDown">
-                <li><a href="#">Profile</a></li>
+                <li><a href="{% url 'user_profile' %}">Profile</a></li>
                 <li role="separator" class="divider"></li>
-                <li><a href="{% url 'logout' %}">Log Out</a></li>
+                <li><a href="{% url 'auth_logout' %}">Log Out</a></li>
               </ul>
           </li>
           {% else %}
-          <li><a href="{% url 'login' %}">login</a></li>
+          <li><a href="{% url 'auth_login' %}">login</a></li>
           {% endif %}
         </ul>
         {% endif %}

metaSearch/mainApp/templates/mainApp/api_index.html

@@ -1,4 +1,4 @@
-{% extends "mainApp/base.html" %}
+{% extends "base.html" %}
 {% load i18n %}
 {% block content %}
   <form action="" method="GETModel could not be found" class="form-inline">

metaSearch/mainApp/templates/mainApp/data.html

@@ -1,4 +1,4 @@
-{% extends "mainApp/base.html" %}
+{% extends "base.html" %}
 
 {% block content %}
 <div class="page-header">

metaSearch/mainApp/templates/mainApp/detail.html

@@ -1,4 +1,4 @@
-{% extends "mainApp/base.html" %}
+{% extends "base.html" %}
 {% load i18n %}
 
 {% block content %}

metaSearch/mainApp/templates/mainApp/edit.html

@@ -1,6 +1,7 @@
-{% extends "mainApp/base.html" %}
+{% extends "base.html" %}
 {% load extras %}
 {% load widget_tweaks %}
+{% load i18n %}
 
 {% block content %}
     <form action="" method="post" id="EditForm">{% csrf_token %}
@@ -41,10 +42,10 @@ <h3>Edit {{project}}</h3>
                 {% render_field form.description_ar class+="form-control" style="direction: rtl;" %}
             </div>
         </div>
-        <div class="form-group {{ form.contact_loc|is_required }}">
+        <div class="form-group {{ form.contact_loc }}">
             <label for="{{ form.contact_loc.id_for_label }}" class="control-label">Contact Address</label>
             <div id="{{ form.contact_loc.id_for_label }}" class="form-group
-            {{ form.contact_loc|is_required }} form-group-addresses">
+            {{ form.contact_loc}} form-group-addresses">
                 <label for="{{ form.contact_address_street.id_for_label }}" class="control-label">Street</label>
                 {% render_field form.contact_address_street class+="form-control form-control-address" %}
                 <label for="{{ form.contact_address_housenr.id_for_label }}" class="control-label">Number</label>
@@ -58,10 +59,10 @@ <h3>Edit {{project}}</h3>
             </div>
         </div>
 
-        <div class="form-group {{ form.geo_location|is_required }}">
+        <div class="form-group {{ form.geo_location }}">
             <label for="{{ form.geo_location.id_for_label }}" class="control-label">Area</label>
             <div id="{{ form.geo_location.id_for_label }}" class="form-group
-            {{ form.geo_location|is_required }} form-group-addresses">
+            {{ form.geo_location }} form-group-addresses">
                 <label for="{{ form.area_city.id_for_label }}" class="control-label">City</label>
                 {% render_field form.area_city class+="form-control form-control-address" %}
                 <label for="{{ form.area_state.id_for_label }}" class="control-label">State</label>
@@ -136,6 +137,7 @@ <h3>Edit {{project}}</h3>
                 selectableHeader: "<div class='control-label'>Selectable items</div>",
                 selectionHeader: "<div class='control-label'>Selections</div>"
             });
+            console.log('{{ form.instance.categories}}')
         }
 
         $(function () {
@@ -146,7 +148,7 @@ <h3>Edit {{project}}</h3>
                 $.each(data, function (key, val) {
                     var grp = document.createElement('optgroup');
                     grp.setAttribute("label", val.name)
-                    $.getJSON("../../../api/search/category?format=json&parent=" + val.id, function (data) {
+                    $.getJSON("../../../api/search/category?format=json&parent*id=" + val.id, function (data) {
                         $.each(data, function (key, val) {
                             var opt = document.createElement('option')
                             opt.value = val.id

metaSearch/mainApp/templates/mainApp/index.html

@@ -3,9 +3,10 @@
 {% get_current_language as LANGUAGE_CODE %}
 {% block content %}
 <div class="row">
-  <form action="javascript:void(0)" method="GET" class="form-inline col-xs-12"> {% csrf_token %}
+  <div method="GET" class="form-inline col-xs-12"> {% csrf_token %}
     <input type="text" name="query" class="form-control" id="search" autocomplete="off">
     <button type="submit" value="Search" class="btn btn-default hidden">{% trans "Search" %}</button>
+  </div>
 </div>
 <div class="row">
     <div id="filter-area" class="col-xs-4">
@@ -17,7 +18,6 @@
         </div>
       {% endfor %}
     </div>
-  </form>
   <div id="search-results" class="col-xs-8"></div>
 </div>
 {%endblock%}

metaSearch/mainApp/templates/mainApp/project_confirm_delete.html

@@ -1,4 +1,4 @@
-{% extends "mainApp/base.html" %}
+{% extends "base.html" %}
 {% load i18n %}
 
 {% block content %}

metaSearch/mainApp/templates/mainApp/userMain.html

@@ -0,0 +1,15 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% get_current_language as LANGUAGE_CODE %}
+{% block content %}
+<div class="row">
+    <div id="area-select" class="col-xs-4">
+      <p><a href="{% url 'user_profile' %}">Profile</a></p>
+      <p><a href="{% url 'auth_password_change' %}">Change Password</a></p>
+      <p><a href="{% url 'user_projects' %}">Projects</a></p>
+    </div>
+  <div id="user-site" class="col-xs-8">
+    {% block usersite %}{% endblock %}
+  </div>
+</div>
+{%endblock%}

metaSearch/mainApp/templates/mainApp/userProfile.html

@@ -0,0 +1,22 @@
+{% extends "mainApp/userMain.html" %}
+{% load i18n %}
+{% get_current_language as LANGUAGE_CODE %}
+{% block usersite %}
+<form action="{% url 'user_profile' %}" method="post">
+    {% csrf_token %}
+    {{ form.non_field_errors }}
+
+    {% for field in form %}
+      <div class="fieldWrapper">
+        {{ field.label_tag }}
+        {{ field }}
+        {{ field.errors }}
+      </div>
+    {% endfor %}
+
+    <input type="submit" value="Submit" />
+</form>
+
+
+
+{%endblock%}

metaSearch/mainApp/templates/mainApp/userProjects.html

@@ -0,0 +1,9 @@
+{% extends "mainApp/userMain.html" %}
+{% load i18n %}
+{% get_current_language as LANGUAGE_CODE %}
+{% block usersite %}
+{% for project in projects %}
+  <h4 class="content"><a href="{% url 'detail' project.id %}">{{ project.title }}</a></h4>
+{% endfor %}
+
+{%endblock%}

metaSearch/mainApp/templates/registration/logged_out.html

@@ -0,0 +1,7 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+Logged out!
+
+{% endblock %}

metaSearch/mainApp/templates/registration/login.html

@@ -0,0 +1,39 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+{% if form.errors %}
+<p>Your username and password didn't match. Please try again.</p>
+{% endif %}
+
+{% if next %}
+    {% if user.is_authenticated %}
+    <p>Your account doesn't have access to this page. To proceed,
+    please login with an account that has access.</p>
+    {% else %}
+    <p>Please login to see this page.</p>
+    {% endif %}
+{% endif %}
+
+<form method="post" action="{% url 'django.contrib.auth.views.login' %}">
+{% csrf_token %}
+<table>
+<tr>
+    <td>{{ form.username.label_tag }}</td>
+    <td>{{ form.username }}</td>
+</tr>
+<tr>
+    <td>{{ form.password.label_tag }}</td>
+    <td>{{ form.password }}</td>
+</tr>
+</table>
+
+<input type="submit" value="login" />
+<input type="hidden" name="next" value="{{ next }}" />
+</form>
+
+<p> New? <a href="{% url 'registration_register'%}">Register!</a></p>
+{# Assumes you setup the password_reset view in your URLconf #}
+{# <p><a href="{% url 'password_reset' %}">Lost password?</a></p>#}
+
+{% endblock %}

metaSearch/mainApp/templates/registration/not_allowed_edit.html

@@ -0,0 +1,7 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+You are not allowed to edit this page.
+
+{% endblock %}

metaSearch/mainApp/templates/registration/password_change_done.html

@@ -0,0 +1,5 @@
+{% extends "mainApp/userMain.html" %}
+
+{% block usersite %}
+  <p> Password change Successful!</p>
+{% endblock %}

metaSearch/mainApp/templates/registration/password_change_form.html

@@ -0,0 +1,10 @@
+{% extends "mainApp/userMain.html" %}
+
+{% block usersite %}
+<form action="{% url 'auth_password_change' %}" method="post">
+    {% csrf_token %}
+    {{form.as_p}}
+    <input type="submit" value="Submit" />
+</form>
+
+{% endblock %}

metaSearch/mainApp/templates/registration/registration_complete.html

@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+<p> Registration completed!</p>
+
+
+{% endblock %}

metaSearch/mainApp/templates/registration/registration_form.html

@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+
+{% block content %}
+<form action="{% url 'registration_register' %}" method="post">
+    {% csrf_token %}
+
+    {{form.as_p}}
+
+    <input type="submit" value="Submit" />
+</form>
+
+{% endblock %}

metaSearch/mainApp/urls.py

@@ -1,22 +1,24 @@
-from django.conf.urls import url
+from django.conf.urls import url, include
 from django.views.generic import TemplateView
 from django.contrib.auth import views as auth_views
-
 from . import views
 from . import views_api
 
 app_name = 't'
 urlpatterns = [
     url(r'^$', views.index, name='index'),
-    url(r'^login/$', 'django.contrib.auth.views.login', name='login'),
-    url(r'^logout/$', 'django.contrib.auth.views.logout',{'next_page': '/mainApp/'}, name='logout'),
-    url(r'^register/$', views.register, name='register'),
+    # url(r'^login/$', 'django.contrib.auth.views.login', name='login'),
+    # url(r'^logout/$', 'django.contrib.auth.views.logout',{'next_page': '/mainApp/'}, name='logout'),
+    # url(r'^register/$', views.register, name='register'),
+    url(r'^accounts/', include('registration.backends.simple.urls')),
     url(r'^(?P<project_id>\d+)/$', views.detail, name='detail'),
     url(r'^search/autocomplete', views.search_titles, name='title'),
     url(r'^search/fulltext', views.search_fulltext, name='fulltext'),
     # url(r'^new/', views.ProjectNewView.as_view(), name='new'),
     url(r'^new/', views.join_page, name='new'),
     url(r'^(?P<pk>[0-9]+)/delete/$', views.ProjectDelete.as_view(), name='project-delete'),
-    url(r'^(?P<pk>[0-9]+)/edit/$', views.ProjectEdit.as_view(), name='project-edit'),
+    url(r'^(?P<project_id>\d+)/edit/$', views.edit_page, name='project-edit'),
     url(r'^data/', views.data, name='data'),
+    url(r'^accounts/profile', views.user_profile, name='user_profile'),
+    url(r'^accounts/projects', views.user_projects, name='user_projects'),
 ]