/ - Diff - Synnefo - Greek Research and Technology Network's projects

             return mark_safe(message + u' '+ msg_extra)
         def owns_project(self, project):
             return project.user_status(self) == 100
             return project.owner == self
         def is_project_member(self, project):
             return project.user_status(self) in [0,1,2,3]
-...
             return self.filter(q)
     PROJECT_STATE_DISPLAY = {
         'Pending': _('Pending review'),
         'Approved': _('Active'),
         'Replaced': _('Replaced'),
         'Unknown': _('Unknown')
+    }
     USER_STATUS_DISPLAY = {
 : _('Owner'),
 : _('Join requested'),
 : _('Pending'),
 : _('Accepted member'),
 : _('Removing'),
 : _('Removed'),
          -1: _('Not a member'),
+    }
     class ProjectApplication(models.Model):
         PENDING, APPROVED, REPLACED, UNKNOWN = 'Pending', 'Approved', 'Replaced', 'Unknown'
         applicant               =   models.ForeignKey(
-...
         def __unicode__(self):
             return "%s applied by %s" % (self.name, self.applicant)
         def state_display(self):
             return PROJECT_STATE_DISPLAY.get(self.state, _('Unknown'))
         def add_resource_policy(self, service, resource, uplimit):
             """Raises ObjectDoesNotExist, IntegrityError"""
             q = self.projectresourcegrant_set
-...
 REMOVED
            -1   User has no association with the project
             """
             if user == self.owner:
                 status = 100
             else:
                 try:
                     membership = self.project.projectmembership_set.get(person=user)
                     status = membership.state
                 except Project.DoesNotExist:
                     status = -1
                 except ProjectMembership.DoesNotExist:
                     status = -1
             try:
                 membership = self.project.projectmembership_set.get(person=user)
                 status = membership.state
             except Project.DoesNotExist:
                 status = -1
             except ProjectMembership.DoesNotExist:
                 status = -1
             return status
         def user_status_display(self, user):
             return USER_STATUS_DISPLAY.get(self.user_status(user), _('Unknown'))
         def members_count(self):
             return self.project.approved_memberships.count()

             return contexts
     def action_extra_context(project, table, self):
     def action_extra_context(application, table, self):
         user = table.user
         url, action, confirm, prompt = '', '', True, ''
         append_url = ''
         if user.owns_project(project):
             url = 'astakos.im.views.project_update'
             action = _('Update')
             confirm = False
             prompt = ''
         elif user.is_project_accepted_member(project):
             url = 'astakos.im.views.project_leave'
             action = _('- Leave')
             confirm = True
             prompt = _('Are you sure you want to leave from the project ?')
         elif not user.is_project_member(project):
             url = 'astakos.im.views.project_join'
             action = _('+ Join')
             confirm = True
             prompt = _('Are you sure you want to join this project ?')
         else:
             action = ''
             confirm = False
             url = None
         url = reverse(url, args=(project.pk, )) + append_url if url else ''
         can_join = True
         try:
             project = Project.objects.get(application=application)
             do_join_project_checks(project)
         except (PermissionDenied, Project.DoesNotExist), e:
             can_join = False
         if can_join:
             if user.is_project_accepted_member(application):
                 url = 'astakos.im.views.project_leave'
                 action = _('Leave')
                 confirm = True
                 prompt = _('Are you sure you want to leave from the project ?')
             elif not user.is_project_member(application):
                 url = 'astakos.im.views.project_join'
                 action = _('Join')
                 confirm = True
                 prompt = _('Are you sure you want to join this project ?')
             else:
                 action = ''
                 confirm = False
                 url = None
         url = reverse(url, args=(application.pk, )) + append_url if url else ''
         return {'action': action,
                 'confirm': confirm,
                 'url': url,
-...
         if membership.state == ProjectMembership.ACCEPTED:
             urls = ['astakos.im.views.project_remove_member']
             actions = [_('Remove')]
             if table.user == membership.person:
                 actions = [_('Leave')]
             prompts = [_('Are you sure you want to remove this member ?')]
             confirms = [True, True]
-...
             return record.person.realname
         def render_status(self, value, *args, **kwargs):
             return MEMBER_STATUS_DISPLAY.get(value, 'Unknown')
             return USER_STATUS_DISPLAY.get(value, 'Unknown')
         class Meta:
             template = "im/table_render.html"

     	<h2>
             <em>
                 {% if user_owns_project %}
                     [ ADMINISTRATOR - {{ object.state|upper }} ]
                     [ PROJECT {{ object.state_display|upper }} ]
                 {%  else %}
                     {% if  user in approve_members %}
                         [ ENROLLED - ACTIVE ]
                     {% if user in approve_members %}
                         [ ACCEPTED MEMBER ]
                     {% else %}
                         [ ENROLLED - PENDING ]
                     {% if member_status == 0 %}
                         [ JOIN REQUESTED ]
                     {% else %}
                         [ NOT A MEMBER ]
                     {% endif %}
                     {% endif %}
                     {% endif %}
                     {% if user_owns_project %}
                 {% if object.last_follower %}<br />
                 <a style="font-size:0.7em"
                     href="{% url astakos.im.views.project_detail object.last_follower.pk %}">MODIFICATION PENDING</a>
                 {% endif %}
                 {% else %}
                 {% endif %}
             </em>
     	 	<span>{{ object.name|upper }}</span>
             <span>{{ object.name|upper }}</span>
             {% if user_owns_project %}
             <br /><a style="font-size:0.7em" href="{% url astakos.im.views.project_update object.pk %}">REQUEST MODIFICATION</a>
             {% else %}
             {% if member_status == -1 %}
+             -
                 <a style="font-size:0.7em"
     href="{% url astakos.im.views.project_join object.pk %}">JOIN</a>
             {% endif %}
                 {% if  user in approve_members %}
+             -
                 <a style="font-size:0.7em"
     href="{% url astakos.im.views.project_leave object.pk %}">LEAVE</a>
                 {% else %}
                 {% endif %}
                 {% endif %}
     	 </h2>
     	 <div class="full-dotted">

             extra_context={
                 'addmembers_form':addmembers_form,
                 'members_table': members_table,
                 'user_owns_project': request.user.owns_project(application)
                 'user_owns_project': request.user.owns_project(application),
                 'modifications_table': modifications_table,
                 'member_status': application.user_status(request.user)
                 })
     @require_http_methods(["GET", "POST"])
-...
               'table': table
             })
     @require_http_methods(["POST"])
     @require_http_methods(["POST", "GET"])
     @signed_terms_required
     @login_required
     @transaction.commit_manually

Synnefo

Revision db9a498c