Added missing import to ProjectSurvey View.

Fix pick_multi only returning one answer as maximum. Reviewed by: Lennard de Rijk

Removed getSurveyResponseFromPost from Surveys helper. We will use the power of Django Forms instead of getting our own properties. This fits better into the rest of Melange which also uses this approach.

Renamed survey-edit-090627.js due to recent changes.

Form errors when taking a Survey now have the correct context.

Fixed Survey Form error giving 505. I failed when changing the system to work with collectCleanedFields.

Surveys can now have required questions and comments can be turned on/off. Storing comments is now working. However some issues arise when form errors occur, like missing context and the errors also trigger before a form has been submitted. Reviewed by: Lennard de Rijk

Added Survey From Field validation. Also added the COMMENT_PREFIX in Survey model to ensure that comments are stored in the same way everwhere. Reviewed by: Lennard de Rijk

Style fixes and a forgotten parameter in Survey(Record) logic. Reviewed by: Lennard de Rijk

Removed unnecessary variable in ProjectSurvey take method.

Overwrite _getSurveyRecordFor in ProjectSurvey view to take StudentProject into account.

Added _getSurveyRecordFor method to Survey View. This method is used by the Take view to get the right SurveyRecord for the current request. Subclassed Views that want to fetch their records in another way can override this method.

Added default Survey list templates for ProjectSurvey and GradingProjectSurvey.

Enable the ProjectSurvey and GradingProjectSurvey views in the core. Also add menu items to the program menu for easy access to these options. Reviewed by: Lennard de Rijk

Implemented taking ProjectSurveys. The user will first be served a list of all eligble StudentProjects for which the ProjectSurvey can be taken. After clicking on the list the key_name of the project is attached as a GET param and the code uses the normal take view with the hooks to let everything run smoothly. An extra access check method is required which checks if the Project mentioned in the GET param is a valid project for the current user. This check will run together with the isSurveyTakable checker.

Edit SurveyRecord model to not make use of different Survey property for each subclass. This does mean that a simple query needs to be constructed by hand whenever you want to query for every SurveyRecord for a specific Survey. However the naming is now the same over each SurveyRecord and it fits well into the rest of the design of Melange.

Made the CSV exporter for Survey not rely on the BackReferenceProperty in Survey.

Added getTakeProjectSurveyRedirect. This redirect is used when taking a ProjectSurvey.

Added the possibility to change the action of the form on the Survey take page.

Small style fix in Surveys helper.

Set required is True for StudentProject reference in ProjectSurveyRecord.

Removed obsolete if tag form take template.

Added hook methods to takeGet and takePost.

Fixed typo in title of Survey Take page.

Add a base implementation of takePost. Normal Surveys can now be taken, however comments are not stored yet.

Added getSurveyResponseFromPost method to Surveys Helper. This method will be used to read the POST dictionary from a request. And will transform it into the fields that need to be set in a SurveyRecord for the questions specified by the given Survey. A TODO has been added to handle the naming/handling of the comment fields.

Added updateOrCreateFromFields method to SurveyRecordLogic. The reading of the fields from the POST request will not happen in this Logic anymore.

Added base class logic for Expando based models.

Removed two obsolete/outdated methods in Survey Logic. The updateSurveyRecord can be found in the SurveyRecord logic.

Removed obsolote method call in Program View.

Clean up and other fixes for Survey modules. Reviewed by: Lennard de Rijk

Implemented the takeGet view for Surveys.

Fixed multiple typos in Survey tooltips strings.

Added skeleton for the take view and its template. Also fixed the sorting of imports of the Survey View.

Move getMenusForScope to the end of the View class. Adhering to our principle that we the methods we use for generating our menus can be usually found at the bottom of the View class.

Changed the Survey public view to give a preview of the Survey. Also changed the access rights for deleting a Survey because of the possible invalid references problem. Added two TODO's to the _public method. The first one involves enabling the SurveyForm to generate a form without passing along the Logic since it is only used to retrieve the Survey entity which we already have available. The second one involves a brief discussion about the getFields method's functionality and name.

Removed activate grade URL pattern from Survey View. The remaining methods will be ported over in a patch from Ajaksu.

Brown paper bag "without tea" morning typo fix in Survey View.

Style fix in Survey views helper.

Returned access checks in Survey View to the right state. This got bugged in James's commt.

Fixed too long line in Surveys helper.

Solved some merging problems and use the getRecordLogic where needed.

Reverted some changes in SurveyLogic. SurveyRecord logic is defined in its own module.

Use an existing logic for showing Survey Results.

Merge params from inheriting Survey views so functionality can be reused.

Add more flexibility to the Survey helper for use with the new Survey types. This includes using the new SurveyLogic methods from an earlier commit. And passing on the Logic from the view where necessary.

Added getRecordLogic method to SurveyLogic. This is used to retrieve the SurveyRecordLogic that belongs to a certain SurveyLogic.

Removed setting of the scope in the ProjectSurvey init. This is because it is not possible to query for another entity outside your entity group in the __init__ fucntion.

Added getSurveyForContent method to SurveyLogic. This method returns a Survey for a given content. The backreferenceproperty will not work because of inheritance.

Calling the correct super in Project and Grading Survey Logic.

merged upstream

Add paver script that will replace our current build.sh from scripts folder. Until I update the wiki to describe how this new paver build script works I'm leaving the old one in the repository. Reviewed by: Pawel Solyga

Add checkHasSurveyAccess access check To-be-reviewed, untested code

fixed critical errors related to survey subclassing and renaming of deadline and opening properties, and surveys in sidebar are now marked as such and have a red color if untaken

Removed survey_kind from Survey model. The inheritance structure should make this obsolete.

Set the correct base_model and scope_logic for extended Survey logic.

Added two missing imports to the Project and Grading Surveys views.

Added SurveyContentSchema to improve readability for the survey helper. Reviewed by: Lennard de Rijk

Added tag v0-5-20090629 for changeset 0dee663d6582

et new Melange version number to 0-5-20090629 in app.yaml.template.

Added skeleton view for ProjectSurvey and GradingProjectSurvey.

Prepared Survey access controls to deal with multiple logics. Also added a TODO to move a method to another view.

Extracted the ProjectSurvey and ProjectGradingSurvey records to a new module.

Removed unused import from Survey model.

Separated two survey types out of the main survey model. These models are ProjectSurvey and GradingProjectSurvey.

Seperated Logic for ProjectSurvey and GradingProject surveys. These changes also include their respective records.

Start on adding ProjectSurvey and GradingProjectSurvey. New classes still need to be made for logic and views so the appropriate methods can be overwritten. Reviewed by: Lennard de Rijk

Added .settings to hgignore. Eclipse IDE uses this map to store some settings. Since this is widely used I decided to add it to the ignore list.

Renamed opening to survey_start and deadline to survey_end. Symmetry seems to be both pleasing and helpful when understanding the code.

Put ResultsLogic in its own Logic module named survey_record.

Removed non-existing import in Survey Logic. James don't get ahead of yourself :D.

Added Survey menu items to the Program menu. Patch by: Daniel Diniz Reviewed by: Lennard de Rijk

Added Surveys to the sitemap. Patch by: Daniel Diniz Reviewed by: Lennard de Rijk

Added View for Surveys. Patch by: James Levy, Daniel Diniz Reviewed by: to-be-reviewed

Added redirect for use in Surveys. Also some minor style changes. Patch by: Daniel Diniz Reviewed by: Lennard de Rijk

Added Access checks for Surveys. Patch by: Daniel Diniz, James Levy Reviewed by: Lennard de Rijk

Added Survey Views Helper for rendering several widgets. Patch by: James Levy, Daniel Diniz, Lennard de Rijk Reviewed by: Lennard de Rijk

Added logic for Survey and SurveyRecord. The logic for the SurveyRecord will be seperated within the upcoming days. Patch by: James Levy, Daniel Diniz, Lennard de Rijk Reviewed by: Lennard de Rijk

Added SurveyRecordGroup for the use in evaluation surveys. Patch by: James Levy, Daniel Diniz Reviewed by: Lennard de Rijk

Added SurveyRecordModel. Lennard: On top of the orginial patch I've added several comments to the fields and two TODO's for further subclassing. Patch by: James Levy, Daniel Diniz, Lennard de Rijk Reviewed by: Lennard de Rijk

Added Survey and SurveyContent model. They are currently located in a single file this can be undone later on. Patch by: James Levy, Daniel Diniz, Lennard de Rijk Reviewed by: Lennard de Rijk

Fixed docstring in Document Logic.

Renamed css due to previous changes in previous commit.

Edited stylesheet for use in Surveys. Patch by: Daniel Diniz, James Levy Reviewed by: Mario Ferraro

Renamed JavaScript files in templates to match the correct files using prefixes.

Adding JS files for use in Surveys. Patch by: Daniel Diniz, James Levy Reviewed by: Mario Ferraro

Added templates considering Surveys. Patch by: Daniel Diniz, James Levy Reviewed by: Lennard de Rijk

Renamed jquery.growfield.js to jquery-growfield.js. Reviewed by: Lennard de Rijk

Patch that adds the JS and CSS files for surveys. The only update is in app/jquery/jquery-ui.core.js, from a non-release (added by Paweł for the date picker) to a slightly updated released version. Reviewed by: Lennard de Rijk, Mario Ferraro Patch by: Daniel Diniz, James Levy

Patch that touches 'upstream' templates, for use in surveys. Consists out of three changes. 1 - Move the </head> placement in base.hmtl to after the closing of scripts_block, so templates that extend base.html can add scripts to the <head>. 2 - Add tooltips for checkboxes inside fieldsets. 3 - Comment out an empty table row in templatetags/_as_table.html, which probably has an arcane reason to stay empty :) Reviewed by: Lennard de Rijk, Pawel Solyga Patch by: Daniel Diniz, James Levy

Fixes an issue where the organization home page would throw a 505 when no projects where accepted. This only happens after the project announced deadline because only then would the project list be constructed.

Added tag v0-5-20090621 for changeset 96ff51144dca

Set new Melange version number to 0-5-20090621 in app.yaml.template

jQuery Spin plugin updated to version 1.1.1 Former version had a bug if max was not specified

Use build-in django 1.0.x on deployed version of Melange. Using SDK (Development server) right now we are still using django.zip when running from build folder and django folder when running from app folder. django.zip file is still uploaded when deploying the app but it's not used. We might totally get rid of django folder and django.zip soon (discussion needed).

Update GAE to 1.2.3 in thirdparty folder.

Added tag v0-5-20090608 for changeset 19e9fdde919e

Set new Melange version number to 0-5-20090604 in app.yaml.template

Temporary fix for Issue 636 by turning off the caching of the page's entities. This also means that pagination is turned back on because querying all 1000 projects every time will take too long.

fix copy/paste fail in homepage caching

Added group attribute to each GHOPProgram property so it is grouped on edit/create forms. Added 3 new groups, "Contest Rules" group, "Prize Information" group and "Task Settings" group to organize the properties in a useful manner on the edit/create forms. Reviewed by: Lennard de Rijk

Changed GHOP module imports to be consistent with rest of Melange code. The imports used the from <module-path> import <module> as <local_module_name> syntax. These kinds of imports are changed to import <module_path.module_name> syntax to be consistent with the Melange code base. Reviewed by: Lennard de Rijk

Changed the property that holds the minimum age required for Students to participate in a GHOP based program. Added a new property student_min_age_as_of to hold the DateTime from when the minimum age should be reached. Changed student_min_age property to now store the student minimum age as an integer. This all feel more user friendly then letting the program admin calculate the required DateTime. Storing the two properties is then still needed in this case since information might be lost otherwise when the program admin brings up the edit view. Reviewed by: Lennard de Rijk

Remove now unneeded getCallback from ghop.__init__

Remove getCallback indirection in modules Instead, assume that the imported module contains the Callback class that was previously returned by getCallback. This is done to prevent a circular import (caused by the __init__ importing a submodule).

Removed authors from 'empty' __init__.py files.

Add HTTP_HOST to environ variables mocked. Also add license headers to run.py.

Added logic for every GHOP specific model. Defined logic for every model defined for GHOP. These logics do nothing special now. They are just inherited from their parent classes. Necessary GHOP specific logic will be added later as necessary. Reviewed by: Lennard de Rijk

Added licenses and fixed the authors of __init__.py for the GHOP module.

Changed imports in models to comply with recent GHOP code move. Reviewed by: Lennard de Rijk

Removed unused import.

Moved the GHOP module into the modules package. This also includes moving the templates and content into their respective place inside the Soc folder. This is to avoid adding every folder to the app.yaml file. Patch by: Madhusudan C.S. and Lennard de Rijk Reviewed by: Lennard de Rijk

also rename batch_size in cron.py

Added tag v0-5-20090604 for changeset 1dc8d7f9458e

Set new Melange version number to 0-5-20090604 in app.yaml.template

Display caught errors on the page itself Similar to the previous commit, show directly rather than redirect.

Make the maintenance page a hardcoded response Show the maintenance message on the requested page, instead of redirecting to a specific url which then displays a page with the maintenance notice.

Merge with Pawel's tip.

Partial fix for displaying mentors and students on Organization home page. Connections between mentors and students are not yet displayed and also there is some probably with displaying markers in Safari for some reason, everything works fine in FF.

Comment out GMaps support in Organization home page template.

Small indentation fix.

Add missing if statement in organization list row template.

Fixed an issue where some access checks would fail due to missing arguments. This happens when an org document is being checked for write access when trying to show the edit link on the document's show page.

Introduced 'module_package' key in params dict to support modules in melange

Now showing link to edit the home page document on the home page. This will only show up if you have the right to edit the document. Update issue 271 Now also working for home pages.

Temporary turn off GMaps support on Organization home pages until it's fixed. Currently not all markers and polyline connections between students and mentors show up.

Added link to edit the Document on the Document's public page. This link will only show if the user is allowed to edit the document. Fixes issue 271. Update issue 271 Owner: ljvderijk

Rename soc-090421.css and update base.html template.

Clarified docstring for document read/write access check.

Small changes in #extra_left, #extra_right tags in css file. Google Maps and Student Project List on Organization home page now doesn't lay on page footer if too high.

Added a link to the website where the user has registered to the welcome email. Fixes Issue 630.

Add taggable-mixin and gviz to build script.

Extend taggable-mixin to support different Tag models. Usage is pretty simple. Tag model is default in Taggable constructor but you can call it with different model like GHOPTaskType that inherits from Tag model. Both Taggable and Tag models have been updated and they don't use hardcoded Tag model anymore and instead use cls of class methods or self.__class__. In case of Taggable it's self.__tag_model.

Make taggable-mixin tests working by updating GAE path.

Merge with Pawel's head.

Add google-visualization-python project to Melange repository. This python module will be used with our Statistics module to leverage Google Visualization API and python as a data source.

Removed unecessary use of %.

Changed University Student expected graduation date to be a dynamic dropdown. The range of choices is dynamically made by taking the current_year-1 to the current_year+20. It does not start at the current year because a Student might need to change it's profile during a Program that runs across multiple years.

Added GHOP specific Mentor and Org Admin Models.

Add missing __init__.py file in taggable-mixin module.

Add taggable-mixin to Melange repository.

Add some missing docstrings to Seeder classes in seed_db.py

Style fixes and pylint: disable-msg comments in different modules.

Add pylint: disable-msg= where needed in Melange modules.

Rename bathSize variable to batch_size in soc.logic.models.base module.

Style fixes and wrong function call fix in soc.views.helper.lists module.

Remove unused variable from soc.view.models.cron module.

Some more pylint fixes in different Melange modules.

Style and pylint fixes in Melange modules.

Style and variable names fixes in soc.modules.core module.

Remove unused imports in Melange modules.

Remove unused imports from main.py.

Some small fixes to unique_user_id_adder module.

Fixed typo in org_prize_assignment model.

remove accidental head

Fixed the notification list to show a properly formatted date and time column.

Link id and key name fixes for Organization And OrgApplication in seed_db.

Add Organization Application seeding. Fix the seeding in seed_db so that a consistent linkid for organization applications is used. Use the last entry in the split array instead of the 2nd.

Make user_id property in User model not required.

Merged with Sverre

Fixed model name and comment typo's in task model. Also changed the corresponding reference properties.

Added several models related to the GHOP workflow. These models will form the base of the GHOP infrastructure together with the already commited task model. Reviewed by: Lennard de Rijk

Do not die on NeedIndexErrors

Add helper functions, model update and jobs for unique user ids.

Add missing django.template import to shell.py.

Revert "Add a supplemantal block to the edit form" This reverts commit f50455c4cdcb.

Revert "Add an EditForm id to the edit form" This reverts commit f835e39b4dbc.

Add a supplemantal block to the edit form

Add an EditForm id to the edit form

Remove executable bit from datatimepicker

Added GHOP Task model. Reviewed by: Lennard de Rijk

Added __init__.py to ghop folder.

Merge with Sverre's recent module architecture commit.

Add web based python shell to Melange. It is accessible via http://host/admin/shell url and requires developer rights. Shell project is part of google-app-engine-samples. This commit moves django configuration from main.py to separate gae_django.py module. Shell project has been modified in order to work correctly with django 1.0+. Build script has been updated and includes shell folder and gae_django.py file. http://code.google.com/p/google-app-engine-samples/source/browse/trunk/shell/

Comment style fix in soc.views.models.organization module.

First step in the module design The new module design allows modules to be registered by adding them to settings.MODULES. Currently modules cannot do a lot (they can register with the sidebar and the sitemap), but the structure is in place.

Add comment regarding Student Project sorting on Organization home page.

Add sorting of student projects on organization home page. List of student projects on organization home page is now sorted in alphabetical order by student name. Fixes issue 613.

Now clicking cancel button returns user to previous page. Fixes issue 569. If you don't want that behaviour you can define cancel_redirect and user will be redirected to given url on "Cancel" button click instead of redirecting to previous page. Patch by: Daniel Hans & Pawel Solyga

Add comment to clean_html_content function and update __authors__.

Invoke pylint from build script. Using --skip-pylint build script command line parameter you can skip pylint invocation.

Replace usage of feedparser for sanitizing html with new HtmlSanitizer module. HtmlSanitizer prevents from XSS attacks (Fixes issue 606).

Add htmlsanitizer folder to build script.

Add missing __init__.py file to htmlsanitizer folder.

Add HtmlSanitizer python module to Melange repository.

Add BeautifulSoup Python HTML/XML parser to Melange repository.

Add acceptedStudentsCSVExport function to stats.py script. This funtion is used to generate CSV with all accepted students. It still needs some work and I left TODOs there. I also added helper function for saving data to CSV, which can be reused for other kinds of reports.

Remove accidentaly committed file.

Merge with Sverre's accidental head.

Do not rely on notifiction module being imported This has worked so far mostly by accident, but it turned out to be brittle while writing tests. This makes sure that the notification module is always imported before use.

Style fixes in test_functional.py.

Add some example function tests that use gaeftest

Use key_name instead of link_id Some entities do not have a link_id, but all entities are guaranteed to have a key_name (or an id).

Use key_name instead of link_id Some entities do not have a link_id, but all entities are guaranteed to have a key_name (or an id).

Include required antl3 library and check if datastore is available The datastore is checked for availability before requesting it to be cleared. This is because gaeftest uses its own method for ensuring no leakage of data by providing a temporary file as the backend. Reviewed by: Sverre Rabbelier

Use offset_linkid instead of offset to scan >1000 entities. this is a first-cut. It works in all the ways I could make earlier versions fail. It passes link_id as URL parameters. It also has a new class LinkCreator which makes the main body of getListContents even easier to write. I wasn't sure if link_id's could have non alphanumeric characters; if so, they need to be URL encoded/decoded. I also need to go and remove any mention of raw offsets now, because we don't use them. I believe I've talked about this approach with a few of you and it sounded reasonable. Feel free to roll-back/fix/amend/comment-for-me-to-fix. This is my first big-logic-change to Melange. Patch by: Dan Bentley

Revert not finished 1000 limitation fix commit (ef7222d484). We are going to put this into separate branch until it's finished.

Add vcs-load-dirs project to thirdparty directory. vcs-load-dirs project contains load-dir scripts for different version control sysystems including git, hg, darcs, bazaar. More information about the project: http://software.complete.org/software/wiki/vcs-load-dirs/ http://software.complete.org/static/vcs-load-dirs/doc//hg_load_dirs.1.html

Add .DS_Store Mac OS X specific files to .hgignore.

Update Google App Engine to 1.2.2 in thirdparty folder.

added foo

Fix ordering of names in AUTHORS file.

Add .gitignore to .hgignore We're all ignoring one another, pretending the other doesn't exist at all, how rude!

Add .git to the .hgignore file

Remove __init__.py from project root as well This is in line with the earlier patch to remove the __init__.py file from the app/ directory. --- 0 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 __init__.py

[PATCH] Remove __init__.py from app, as app is not a module From 6916391964ed3b48021351d3a9ea7a7bc836a373 Mon Sep 17 00:00:00 2001 Date: Sat, 9 May 2009 15:19:04 +0200 --- scripts/build.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) delete mode 100644 app/__init__.py

Renamed duplicate slots because of recent changes.

Fixes Issue 625 where the Duplicate calculation would hang if no assigned slots where available. Reviewed by: Lennard de Rijk

Fixed Issue 627 where multiple Purr boxes would show when using calendar widget.

Add Marcelo to AUTHORS file and fix typo

Add coverage support to the test suite This requires nose 0.11 to run.

Added coverage output files to .hgignore Patch by: Sverre Rabbelier

Fixed typo in docstring as to comments on r3012 (svn repo). Also now importing logic and using keyword arguments as to comply with the codebase standards Patch by: Lennard de Rijk Reviewed by: to-be-reviewed

Replace BeautyTips tooltips with purr info box for all form fields with help text. Patch by: Mario Ferraro Reviewed by: Pawel Solyga

Use python2.5 in our unit tests Patch by: Sverre Rabbelier

Ignore .project and .pydevproject files Patch by: Sverre Rabbelier

Add full list of accepted students Patch by: Daniel Hans

Ignore backup files (*~) Patch by: Sverre Rabbelier

Ignore zip files and build directory Patch by: Sverre Rabbelier

Merged revert

Backed out changeset 571f2de51138 Test commit that was not meant to be committed. Patch by: Sverre Rabbelier

Make dev_appserver error out when python version >2.5 is used Patch by: Sverre Rabbelier

Added file 'foo.txt'

Fixed StudentProposal apply view that broke during split of Create/Edit view. Also included whitespace fixes. Patch by: Lennard de Rijk Reviewed by: to-be-reviewed

Fix Issue 389 (Clicking list entry will not open new tab/window). Patch by: Daniel Hans Reviewed by: Pawel Solyga

Fix too long line in soc.view.models.organization module. Patch by: Pawel Solyga Reviewed by: to-be-reviewed

Remove E1103 and E1101 errors from ignore list in pylintrc file. We are going to use "# pylint disable-msg=E1103" comments in the source file itself to ignore false-positives. Patch by: Pawel Solyga Reviewed by: to-be-reviewed

Style fixes in app.soc.views.models.student_project module. Too long line and missing whitespace. Patch by: Pawel Solyga Reviewed by: to-be-reviewed

Show all Co-Mentors on the Student Project public page. Patch by: Lennard de Rijk Reviewed by: to-be-reviewed

Changed Additional Mentors to Co-Mentors in the manage view. Due to a conversation with Pawel. Patch by: Lennard de Rijk Reviewed by: to-be-reviewed

Added functionality to set additional mentors for a Student Project. Patch by: Lennard de Rijk Reviewed by: to-be-reviewed

Fixed missing value in context when a form with a different name then form was used. Patch by: Lennard de Rijk Reviewed by: to-be-reviewed

Fix broken tests by renaming default app id from "your_app_id" to "test-app-run". This fix is required due to changes in GAE 1.2.1. Patch by: Pawel Solyga

Add .hgignore to repository and ignore all .pyc files and app.yaml file. Patch by: Pawel Solyga

Add getStudentsProjects to context in stats.py script. Patch by: Pawel Solyga

Load /Users/solydzajs/Desktop/google_appengine into trunk/thirdparty/google_appengine.

Renamed .css file due to recent changes. Patch by: Lennard de Rijk Reviewed by: to-be-reviewed

Added map of accepted student proposals to mentors to the org home page. Patch by: Madhusudan C.S Reviewed by: Lennard de Rijk

Fix missing dot in stats.py docstring. Patch by: Pawel Solyga Reviewed by: to-be-reviewed

Fixing the build now that emails have been tested. Patch by: Augie Fackler