__version__ = '0.2'

README.rst

@@ -0,0 +1,13 @@
+djcharme
+========
+
+CHARMe project node
+
+
+See the 
+`docs directory <https://github.com/cedadev/djcharme/tree/develop/djcharme/docs>`_
+for information on 
+`installation <https://github.com/cedadev/djcharme/blob/develop/djcharme/docs/CHARMeNodeInstallation.pdf>`_,
+the 
+`interface <https://github.com/cedadev/djcharme/blob/develop/djcharme/docs/CHARMeNodeICD.pdf>`_
+and examples.

djcharme/.gitignore

@@ -1,8 +1,2 @@
-/dist
+/build
 /djcharme.egg-info
-/deployIndjcharme.sh
-/deployIndjcharme.sh~
-/sqlite.db
-/.settings
-/.project
-/.pydevproject

djcharme/LICENSE

@@ -1,27 +1,27 @@
-
 BSD Licence
-Copyright (c) 2012, Science & Technology Facilities Council (STFC)
+Copyright (c) 2015, Science & Technology Facilities Council (STFC)
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, 
+Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright notice, 
+    * Redistributions of source code must retain the above copyright notice,
         this list of conditions and the following disclaimer.
     * Redistributions in binary form must reproduce the above copyright notice,
-        this list of conditions and the following disclaimer in the documentation
-        and/or other materials provided with the distribution.
-    * Neither the name of the Science & Technology Facilities Council (STFC) 
-        nor the names of its contributors may be used to endorse or promote 
-        products derived from this software without specific prior written permission.
+        this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+    * Neither the name of the Science & Technology Facilities Council (STFC)
+        nor the names of its contributors may be used to endorse or promote
+        products derived from this software without specific prior written
+        permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

djcharme/MANIFEST.in

@@ -1,4 +1,5 @@
 include LICENSE
+recursive-include docs *
 recursive-include djcharme/resources *
 recursive-include djcharme/templates *
 recursive-include djcharme/static *

djcharme/djcharme/.gitignore

@@ -1,5 +1,2 @@
-/__init__.pyc
-/local_settings.pyc
-/settings.pyc
-/urls.pyc
-/wsgi.pyc
+/*.pyc
+/sqlite.db

djcharme/djcharme/__init__.py

@@ -1,49 +1,94 @@
-__version__ = '0.1'
+'''
+BSD Licence
+Copyright (c) 2015, Science & Technology Facilities Council (STFC)
+All rights reserved.
 
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
+    * Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+    * Neither the name of the Science & Technology Facilities Council (STFC)
+        nor the names of its contributors may be used to endorse or promote
+        products derived from this software without specific prior written
+        permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+'''
+__version__ = '0.7.3'
+
+
+import os
+
+from django.conf import settings
 from django.core.context_processors import csrf
-from django.template.context import RequestContext
-from django.shortcuts import render_to_response, render
-from django.http.response import Http404
 from django.core.exceptions import ObjectDoesNotExist
+from django.http.response import Http404
+from django.shortcuts import render_to_response, render
+from django.template.context import RequestContext
+
+
+LOAD_SAMPLE = 'LOAD_SAMPLE'
+HTTP_PROXY = 'HTTP_PROXY'
+HTTP_PROXY_PORT = 'HTTP_PROXY_PORT'
+
+
+def get_resource(file_name):
+    return os.path.join(__path__[0], 'resources', file_name)
+
 
 def mm_render_to_response(request, context, page_to_render):
     """
     Exploits a 'render_to_response' action. The advantage of this method
     is to contains a number of operations that are expected to be  called
     for each page rendering, for example passing the application version number
-     
-    **Parameters**            
+
+    **Parameters**
         * HttpRequest_ **request**
-            a django HttpRequest instance       
+            a django HttpRequest instance
         * `dict` **context**
-            a dictionary where to pass parameter to the rendering function   
+            a dictionary where to pass parameter to the rendering function
         * `string` **page_to_render**
-            the html page to render                         
+            the html page to render
     """
     if context is None or not isinstance(context, dict):
         raise Exception("Cannot render an empty context")
-    
-    #context['version'] = assemble_version()
+
+    # context['version'] = assemble_version()
     context.update(csrf(request))
     rcontext = RequestContext(request, context)
     return render_to_response(page_to_render, rcontext)
 
+
 def mm_render_to_response_error(request, page_to_render, status):
     """
     Exploits a 'render_to_response' action. The advantage of this method
     is to contains a number of operations that are expected to be  called
     for each page rendering, for example passing the application version number
-     
-    **Parameters**            
+
+    **Parameters**
         * HttpRequest_ **request**
-            a django HttpRequest instance       
+            a django HttpRequest instance
         * `dict` **context**
-            a dictionary where to pass parameter to the rendering function   
+            a dictionary where to pass parameter to the rendering function
         * `string` **page_to_render**
-            the html page to render                         
+            the html page to render
     """
-    context = {}    
+    context = {}
     context.update(csrf(request))
     rcontext = RequestContext(request, context)
-    return render(request, page_to_render, context_instance = rcontext, status = status)
+    return render(request, page_to_render, context_instance=rcontext,
+                  status=status)

djcharme/djcharme/admin.py

@@ -0,0 +1,139 @@
+"""
+Admin stuff.
+
+"""
+from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.models import User
+from djcharme.models import UserProfile, Organization, OrganizationClient, \
+    OrganizationUser
+from provider.oauth2.admin import ClientAdmin
+from provider.oauth2.models import Client
+
+
+class UserProfileInline(admin.StackedInline):
+    """
+    The in-line display of the User Profile.
+
+    """
+    model = UserProfile
+    can_delete = False
+    verbose_name = 'Profile'
+    verbose_name_plural = 'Profiles'
+    list_display = ('show_email')
+
+
+class OrganizationUserInline(admin.StackedInline):
+    """
+    The in-line display of the Organization User.
+
+    """
+    model = OrganizationUser
+    can_delete = False
+    verbose_name = 'Role'
+    verbose_name_plural = 'Roles'
+    list_display = ('organization', 'role')
+    extra = 1
+
+
+class OrganizationClientInline(admin.StackedInline):
+    """
+    The in-line display of the Organization Client.
+
+    """
+    model = OrganizationClient
+    verbose_name = 'Organization'
+    verbose_name_plural = 'Organization'
+    extra = 1
+    fk_name = "client"
+
+
+class OrganizationAdmin(admin.ModelAdmin):
+    """
+    The Organization Admin.
+
+    """
+    list_display = ('name', 'primary_email')
+
+
+class OrganizationClientAdmin(admin.ModelAdmin):
+    """
+    The Organization Client Admin.
+
+    """
+    list_display = ('organization', 'client')
+    list_filter = ['organization']
+
+
+class OrganizationUserAdmin(admin.ModelAdmin):
+    """
+    The Organization User Admin.
+
+    """
+    fields = ['organization', 'user', 'role']
+    list_display = ('organization', 'user', 'role')
+    list_filter = ['organization', 'user']
+
+
+class ClientAdmin_(ClientAdmin):
+    """
+    The new version of ClientAdmin, which includes the Organization Client.
+
+    """
+    inlines = [OrganizationClientInline]
+    list_display = ('url', 'get_organization', 'redirect_uri', 'client_id',
+                    'client_type')
+
+    def get_organization(self, obj):
+        """
+        Get the name of the organization, there should only be one.
+
+        """
+        return obj.organizationclient_set.first()
+
+    get_organization.short_description = 'organization'
+
+
+class UserAdmin_(UserAdmin):
+    """
+    The new version of UserAdmin, which includes the User Profile and
+    Organization User.
+
+    """
+    inlines = [UserProfileInline, OrganizationUserInline]
+    list_display = ('username', 'get_role', 'email', 'first_name', 'last_name',
+                    'is_staff')
+
+    def get_role(self, obj):
+        """
+        Get the role of the user, they may have more than one role.
+
+        """
+        admin_ = False
+        user = False
+        for organizationuser in obj.organizationuser_set.iterator():
+            if organizationuser.role == 'admin':
+                admin_ = True
+            else:
+                user = True
+
+        if admin_ and user:
+            return 'admin & user'
+        elif admin_:
+            return 'admin'
+        elif admin_:
+            return 'user'
+        else:
+            return ''
+
+    get_role.short_description = 'roles in organizations'
+
+
+# Re-register UserAdmin
+admin.site.unregister(User)
+admin.site.register(User, UserAdmin_)
+admin.site.unregister(Client)
+admin.site.register(Client, ClientAdmin_)
+admin.site.register(Organization, OrganizationAdmin)
+admin.site.register(OrganizationUser, OrganizationUserAdmin)
+admin.site.register(OrganizationClient, OrganizationClientAdmin)