GitLab Settings integrated

.gitignore

@@ -3,6 +3,8 @@ piebase/migrations/*
 *.pyc
 *~
 .idea/
-media/profile
+media
 pietrack/local_settings.py
 .coverage
+*.swp
+pietrack.egg-info/

README.md

@@ -1,26 +1 @@
-# pietrack
-opensource project management software.
-
-[![Code Health](https://landscape.io/github/MicroPyramid/pietrack/master/landscape.svg?style=flat)](https://landscape.io/github/MicroPyramid/pietrack/master) [![Documentation Status](https://readthedocs.org/projects/pietrack/badge/?version=latest)](https://readthedocs.org/projects/pietrack/?badge=latest) [![Build Status](https://travis-ci.org/MicroPyramid/pietrack.svg?branch=master)](https://travis-ci.org/MicroPyramid/pietrack) [![Coverage Status](https://coveralls.io/repos/MicroPyramid/pietrack/badge.svg?branch=master&service=github)](https://coveralls.io/github/MicroPyramid/pietrack?branch=master)
-
-head to http://pietrack.readthedocs.org/ for latest documentation
-
-Features:
----------
-* Project Wiki
-* Bug Tracking
-* Project backlog
-* Activity log
-
-Contribute:
-----------
-* Fork [pietrack repository](https://github.com/MicroPyramid/pietrack)
-on GitHub to start making your changes to the pietrack(Project Management Tool).
-* Write Python3 compatable code.
-* Write a tests which shows that the code works as expected or bug fixed.
-* Send a pull request to author.
-
-
-## Community
-
-Questions or comments? Join us [on Slack](https://micropyramid.slack.com)
+# PieTrack

README.rst

@@ -0,0 +1,50 @@
+Pietrack
+=========
+
+An Open Source Project Management Software.
+
+
+.. image:: https://landscape.io/github/MicroPyramid/pietrack/master/landscape.svg?style=flat
+   :target: https://landscape.io/github/MicroPyramid/pietrack/master
+   :alt: Code Health
+
+.. image:: https://readthedocs.org/projects/pietrack/badge/?version=latest
+   :target: https://readthedocs.org/projects/pietrack/?badge=latest
+   :alt: Documentation Status
+
+.. image:: https://travis-ci.org/MicroPyramid/pietrack.svg?branch=master
+   :target: https://travis-ci.org/MicroPyramid/pietrack
+   :alt: Build Status
+
+.. image:: https://coveralls.io/repos/MicroPyramid/pietrack/badge.svg?branch=master&service=github
+   :target: https://coveralls.io/github/MicroPyramid/pietrack?branch=master
+   :alt: Coverage Status
+
+Head to http://pietrack.readthedocs.org/ for latest documentation.
+
+
+Features:
+-----------
+* Project Wiki
+* Bug Tracking
+* Project backlog
+* Activity log
+
+
+Contribute:
+--------------
+
+* Fork Pietrack Repository_ on GitHub to start making your changes to the pietrack(Project Management Tool).
+* Write Python3 compatable code.
+* Write tests which shows that the code works as expected or bug fixed.
+* Send a pull request to author.
+
+
+Community:
+--------------
+
+Questions or comments? Join us on Slack_
+
+
+.. _Repository: https://github.com/MicroPyramid/pietrack
+.. _Slack: https://micropyramid.slack.com

accounts/forms.py

@@ -1,17 +1,63 @@
-from piebase.models import User
+from piebase.models import User, Organization
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 from django.core.files.images import get_image_dimensions
 
+
 class EditUserModelForm(forms.ModelForm):
+
     class Meta:
         model = User
-        fields = ['profile_pic', 'username', 'email', 'first_name', 'last_name', 'biography']
+        fields = ['profile_pic', 'username',
+                  'first_name', 'last_name', 'biography']
+
 
 class RegisterForm(forms.ModelForm):
     confirm_password = forms.CharField(widget=forms.PasswordInput)
     organization = forms.CharField()
+    domain = forms.CharField()
+
+    def __init__(self, *args, **kwargs):
+        self.email = kwargs.pop('email', None)
+        super(RegisterForm,self).__init__(*args, **kwargs)
 
     class Meta:
         model = User
         fields = ['email', 'first_name', 'password', 'username']
+
+    def clean_domain(self):
+        if self.email.split('@')[1] != self.cleaned_data['domain'] :
+            raise forms.ValidationError('Domain name must be same as your email domain.')
+        elif Organization.objects.filter(domain=self.cleaned_data['domain']):
+            raise forms.ValidationError('Domain used by other organization. Please choose other. or If you are a member contact your organization admin.')
+        return self.cleaned_data['domain']
+
+class ChangePasswordForm(forms.Form):
+    password = forms.CharField(
+        label=_("Old Password"), widget=forms.PasswordInput)
+    password1 = forms.CharField(
+        label=_("Password"), widget=forms.PasswordInput)
+    password2 = forms.CharField(
+        label=_("Password (again)"), widget=forms.PasswordInput)
+
+    def __init__(self, *args, **kwargs):
+        self.request = kwargs.pop('request', None)
+        super(ChangePasswordForm, self).__init__(*args, **kwargs)
+
+    def clean_password(self):
+        auser = self.request.user
+        opassword = self.request.POST['password']
+        success = auser.check_password(opassword)
+
+        if not success:
+            raise forms.ValidationError(_('Old password is not matching !'))
+
+        return opassword
+
+    def clean_password2(self):
+        form_cleaned_data = self.cleaned_data
+        if 'password1' in form_cleaned_data:
+            if form_cleaned_data['password1'] != form_cleaned_data['password2']:
+                raise forms.ValidationError(
+                    _("The two password fields did not match."))
+        return form_cleaned_data['password2']

accounts/urls.py

@@ -7,8 +7,15 @@
     url(r'^$', 'accounts.views.index', name='index'),
     url(r'^login/$', 'accounts.views.login', name='login'),
     url(r'^register/$', 'accounts.views.register', name='register'),
-    url(r'^forgot_password/$', 'accounts.views.forgot_password', name='forgot_password'),
-    url(r'^user_profile/$', 'accounts.views.user_profile', name='user_profile'),
-    url(r'^change_password/$', 'accounts.views.change_password', name='change_password'),
+    url(r'^forgot_password/$', 'accounts.views.forgot_password',
+        name='forgot_password'),
+    url(r'^profile/$', 'accounts.views.user_profile',
+        name='user_profile'),
+    url(r'^change_password/$', 'accounts.views.change_password',
+        name='change_password'),
     url(r'^logout/$', 'accounts.views.logout', name='logout'),
+    url(r'^reset_confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',
+        'accounts.views.reset_confirm', name='reset_confirm'),
+    url(r'^read_notifications/$', 'accounts.views.read_notifications', name='read_notifications'),
+    url(r'^get_notifications/$', 'accounts.views.get_notifications', name='get_notifications'),
 ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)