# HG changeset patch # User Sverre Rabbelier # Date 1240063376 0 # Node ID 1bf4e904d5f54d7fd43e3b637fa26ba4d859773e # Parent f283f7b9942786ebe5f3b62f9d9bdae2e50598ea Add priority groups (model, logic, and view) Priority groups will be a key part of the Job system, allowing the site admin to give a higher priority to certain job types on the fly. Patch by: Sverre Rabbelier diff -r f283f7b99427 -r 1bf4e904d5f5 app/soc/logic/models/priority_group.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/soc/logic/models/priority_group.py Sat Apr 18 14:02:56 2009 +0000 @@ -0,0 +1,89 @@ +#!/usr/bin/python2.5 +# +# Copyright 2009 the Melange authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Priority Group (Model) query functions. +""" + +__authors__ = [ + '"Sverre Rabbelier" ', + ] + + +from soc.logic.models import base + +import soc.models.priority_group + + +class Logic(base.Logic): + """Logic methods for the Priority Group model. + """ + + def __init__(self, model=soc.models.priority_group.PriorityGroup, + base_model=None, scope_logic=None): + """Defines the name, key_name and model for this entity. + """ + + self.EMAIL = 'emails' + self.CONVERT = 'convert' + + self.groups = { + self.EMAIL: 'Send out emails', + self.CONVERT: 'Convert one entity to another type', + } + + super(Logic, self).__init__(model=model, base_model=base_model, + scope_logic=scope_logic) + + def getKeyValuesFromEntity(self, entity): + """See base.Logic.getKeyValuesFromEntity. + """ + + return [entity.link_id] + + def getKeyValuesFromFields(self, fields): + """See base.Logic.getKeyValuesFromFields. + """ + + return [fields['link_id']] + + def getKeyFieldNames(self): + """See base.Logic.getKeyFieldNames. + """ + + return ['link_id'] + + def getGroup(self, key_name): + """Return the specified Priority Group entity. + """ + + if key_name not in self.groups: + raise base.InvalidArgumentError("Unknown priority group %s." % key_name) + + group = self.getFromKeyName(key_name) + + if not group: + fields = { + 'link_id': key_name, + 'name': self.groups[key_name], + 'priority': 0, + } + + group = self.updateOrCreateFromKeyName(fields, key_name) + + return group + + +logic = Logic() diff -r f283f7b99427 -r 1bf4e904d5f5 app/soc/models/priority_group.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/soc/models/priority_group.py Sat Apr 18 14:02:56 2009 +0000 @@ -0,0 +1,39 @@ +#!/usr/bin/python2.5 +# +# Copyright 2009 the Melange authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""This module contains the Priority Group Model.""" + +__authors__ = [ + '"Sverre Rabbelier" ', +] + + +from google.appengine.ext import db + +from django.utils.translation import ugettext + +from soc.models import linkable + + +class PriorityGroup(linkable.Linkable): + """The PriorityGroup model. + """ + + #: the priority of this group, 0 being lower than 1 + priority = db.IntegerProperty(required=False, default=0) + + #: the human readable name of this priority gropu + name = db.StringProperty(required=False) diff -r f283f7b99427 -r 1bf4e904d5f5 app/soc/templates/soc/priority_group/list/heading.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/soc/templates/soc/priority_group/list/heading.html Sat Apr 18 14:02:56 2009 +0000 @@ -0,0 +1,5 @@ + + Link ID + Name + Priority + diff -r f283f7b99427 -r 1bf4e904d5f5 app/soc/templates/soc/priority_group/list/row.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/soc/templates/soc/priority_group/list/row.html Sat Apr 18 14:02:56 2009 +0000 @@ -0,0 +1,13 @@ + + +
+ {{ list.item.link_id }} +
+ +
{{ list.item.name }}
+
+ {% if not list.item.priority %}disabled{% else %}{{ list.item.priority }}{% endif %} +
+ diff -r f283f7b99427 -r 1bf4e904d5f5 app/soc/templates/soc/priority_group/public.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/soc/templates/soc/priority_group/public.html Sat Apr 18 14:02:56 2009 +0000 @@ -0,0 +1,29 @@ +{% extends "soc/base.html" %} +{% comment %} +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +{% endcomment %} +{% load forms_helpers %} + +{% block body %} +

+ + {% readonly_field_as_table_row entity.fields.link_id.label entity.link_id %} + {% readonly_field_as_table_row entity.fields.name.label entity.name %} + {% if not entity.priority %} + {% readonly_field_as_table_row entity.fields.priority.label "disabled" %} + {% else %} + {% readonly_field_as_table_row entity.fields.priority.label entity.priority %} + {% endif %} +
+

+{% endblock %} diff -r f283f7b99427 -r 1bf4e904d5f5 app/soc/views/models/priority_group.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/soc/views/models/priority_group.py Sat Apr 18 14:02:56 2009 +0000 @@ -0,0 +1,71 @@ +#!/usr/bin/python2.5 +# +# Copyright 2009 the Melange authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Views for Priority Groups. +""" + +__authors__ = [ + '"Sverre Rabbelier" ', + ] + + +from django import forms + +from soc.logic import cleaning +from soc.logic import dicts +from soc.logic.models.priority_group import logic as priority_group_logic +from soc.views.helper import access +from soc.views.helper import decorators +from soc.views.helper import dynaform +from soc.views.helper import widgets +from soc.views.models import base + + +class View(base.View): + """View methods for the Priority Group model. + """ + + def __init__(self, params=None): + """Defines the fields and methods required for the base View class + to provide the user with list, public, create, edit and delete views. + + Params: + params: a dict with params for this View + """ + + rights = access.Checker(params) + + new_params = {} + new_params['rights'] = rights + new_params['logic'] = priority_group_logic + + new_params['name'] = "Priority Group" + + new_params['no_create_raw'] = True + new_params['no_create_with_scope'] = True + new_params['no_create_with_key_fields'] = True + + params = dicts.merge(params, new_params) + + super(View, self).__init__(params=params) + + +view = View() + +delete = decorators.view(view.delete) +edit = decorators.view(view.edit) +list = decorators.view(view.list) +public = decorators.view(view.public)