[Mpuls-commits] r2043 - in wasko/branches/2.0: . jmdweb/controllers

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-03-19 15:35:19 +0100 (Fri, 19 Mar 2010)
New Revision: 2043

Removed:
   wasko/branches/2.0/jmdweb/controllers/case_overview.py
Modified:
   wasko/branches/2.0/ChangeLog
Log:
Deleted case_overview controller. Not used anymore.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-03-19 14:33:40 UTC (rev 2042)
+++ wasko/branches/2.0/ChangeLog	2010-03-19 14:35:19 UTC (rev 2043)
@@ -26,6 +26,24 @@
 	* jmdweb/model/case.py (Case.getEditor),(setEditor): New. copied from
 	  jmdweb. setEditor only defines transfering the case to the new user.
 	  No setting of names in forms are done. 
+	* jmdweb/model/case.py (MpulsCase.getDocuments): New. copied from
+	  jmdweb 
+	* jmdweb/model/case.py (Case.getDocuments): Deleted. Now defined in
+	  mpulsweb
+	* jmdweb/model/case.py (State.getPhaseDescription): Use new phasemodel
+	  to get decription and state of current phase. 
+	* jmdweb/controllers/case_overview.py (CaseOverviewController):
+	  Deleted obsolete code. The code was either moved to mpulsbase or is
+	  not used in jmd yet (xml-import xml-export e.g) 
+	* INSTALL: Updated Information on how to configure caseoverview.
+	* jmdweb/lib/app_globals.py: Added global var for case object
+	* mpulsweb/model/case.py (Field): Added three new option to configure
+	  if and how a field will be displayed in the overview page, 
+	  (MpulsCase.get_overview_fields): Added new function to return a list
+	  of fields which will be shown in overview.
+	* mpulsweb/templates/casemanagement/caselist.mako: Which fields are
+	  shown in overview ist no determined by settings in the json file.
+	* jmdweb/controllers/case_overview.py: Deleted. Not used anymore.
 
 2010-03-18  Bernhard Herzog  <bh at intevation.de>
 
@@ -59,7 +77,6 @@
 	* mpulsweb/lib/renderer.py (ViewRenderer._renderChild): Log a
 	debug message if a child will be ignored unexpectedly.
 
->>>>>>> .r2029
 2010-03-18  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* mpulsweb/config/routing.py: Added new route for new controller to

Deleted: wasko/branches/2.0/jmdweb/controllers/case_overview.py
===================================================================
--- wasko/branches/2.0/jmdweb/controllers/case_overview.py	2010-03-19 14:33:40 UTC (rev 2042)
+++ wasko/branches/2.0/jmdweb/controllers/case_overview.py	2010-03-19 14:35:19 UTC (rev 2043)
@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright 2007, 2008, 2010 Intevation GmbH, Germany, <info at intevation.de>
-#
-# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
-# Web-Anwendungs-Server fuer Kompetenzagenturen).
-#
-# mpuls WASKA is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Affero General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public
-# License for more details.
-#
-# You should have received a copy of the GNU Affero General Public
-# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
-#
-# mpuls WASKA has been developed on behalf of the
-# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
-# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
-# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
-# European Social Fund resources.
-#
-# Authors:
-# Torsten Irländer <torsten.irlaender at intevation.de>
-#
-
-import logging
-
-from mpulsweb.controllers.case_overview import CaseOverviewController as \
-     CaseBaseOverviewController, get_sort
-
-log = logging.getLogger(__name__)
-
-class CaseOverviewController(CaseBaseOverviewController):
-
-    def parseSortOptions(self, options=None):
-        search_options = []
-        sort_field, sort_order = get_sort(options)
-        if sort_field == "name_1":
-            search_options.append('sort_field:name')
-        if sort_field == "vorname_1":
-            search_options.append('sort_field:m.vorname')
-        if sort_field == "zugriff":
-            search_options.append('sort_field:zugriff')
-        if sort_field == "kundennummer":
-            search_options.append('sort_field:fn')
-        if sort_field == "bearbeiter_id":
-            search_options.append('sort_field:bearbeiter_id')
-
-        if sort_order == "desc":
-            search_options.append('sort_order:desc')
-        else:
-            search_options.append('sort_order:asc')
-        return search_options
-
-# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8: