gfawcett [Thu, 29 Jul 2010 03:08:02 +0000 (03:08 +0000)]
more on linktool (sakai)
The darn model is trickier than I expected.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@941
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 29 Jul 2010 03:06:19 +0000 (03:06 +0000)]
fix timespan midpoint arithmetic
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@940
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Wed, 28 Jul 2010 03:17:48 +0000 (03:17 +0000)]
sakai (linktool) integration almost done...
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@939
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Tue, 27 Jul 2010 02:45:15 +0000 (02:45 +0000)]
progress on sakai (linktool) association with reserves lists.
Still more to do on the instructor side, re: creating new reserves
Sites, or associating with existing ones.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@938
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Mon, 19 Jul 2010 01:35:55 +0000 (01:35 +0000)]
reorg of site editing code; starting on smarter sakai-linktool integration
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@930
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Fri, 16 Jul 2010 19:56:52 +0000 (19:56 +0000)]
linktool redirector URL fix.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@929
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Fri, 16 Jul 2010 19:37:09 +0000 (19:37 +0000)]
Preliminary Sakai Linktool support
Merged git branch 'linktool-auth' (
6aae15a) into 'master'. I used
'--squash', which loses the merge history, but allows the merge to be
committed to SVN ('linktool-auth' was not an SVN branch).
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@928
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Fri, 16 Jul 2010 17:38:23 +0000 (17:38 +0000)]
Access-control model changes. Simplistic site-permisisons screen. Schema changes.
The site-permissions screen is unfinished; need ways to add
individuals and external groups. Right now it's mainly informational.
I've taken out the passkey (invitation-code) system for now; it could
easily be reimplemented in terms of a Group with a 'passkey:NNN'
external ID.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@927
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Fri, 16 Jul 2010 17:38:20 +0000 (17:38 +0000)]
minor import cleanups
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@926
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Fri, 16 Jul 2010 15:39:49 +0000 (15:39 +0000)]
a few minor bug fixes.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@925
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:56:53 +0000 (00:56 +0000)]
south migration for unique-name indexes. Run ./manage.py migrate.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@924
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:56:01 +0000 (00:56 +0000)]
tweaks
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@923
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:55:56 +0000 (00:55 +0000)]
moved marcxml to conifer.libsystems; removed refs to old campus integration module; cleanup.
I've left some of the campus refs, in code that I know is getting an
overhaul soon.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@922
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:55:50 +0000 (00:55 +0000)]
simplified 'reserves search' function
I broke the search() function into two parts, a request/response outer
function, and an inner function focussed on getting the actual result
sets. Much cleaning up ensued.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@921
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:55:46 +0000 (00:55 +0000)]
got rid of 'user_filters', moving towards putting filter-clause generators in the model.
So, if you want a clause that would show only Items accessible by the current user:
accessible = Item.objects.filter(Item.filter_for_user(current_user))
filter_for_user() returns a Q() object, which can be combined using
binary ops to construct more complex queries.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@920
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:55:37 +0000 (00:55 +0000)]
The Great Cleanup
I've made some radical cuts and reorganizations to the source. Most
functions are still working.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@919
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:55:26 +0000 (00:55 +0000)]
moving to new integration system; dummy item_status integration.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@918
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:55:13 +0000 (00:55 +0000)]
working around z3950/unicode issues; several minor changes.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@917
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:55:06 +0000 (00:55 +0000)]
admin: refresh terms from external system.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@916
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:54:58 +0000 (00:54 +0000)]
admin: refresh dept/course list from external system
Right now I have a hardcoded list of externals, accessed using the
'hook' system. This needs to change of course.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@915
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:54:53 +0000 (00:54 +0000)]
changing 'published' to a char field; storing marc record in item. Breaking schema change.
Unicode in Z39.50 results is currently broken.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@914
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:54:47 +0000 (00:54 +0000)]
Create site, view site, add items to site mostly working again
The 'about/metadata' item links are not working yet. I need to
refactor the add-item forms quite a bit, esp. wrt. consistent metadata
entry.
The site-permissions screen is still a farce, and needs to be
rewritten to address the new membership-group model.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@913
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:54:42 +0000 (00:54 +0000)]
Changed mind: each Site has exactly one Course, one Term, one Owner. Schema change.
This radically simplifies the design. Access control and
personalization can still be addressed through membership Groups.
There can be only one Site with a given (course, term, owner) triple.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@912
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:54:27 +0000 (00:54 +0000)]
my test fixture
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@911
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:54:14 +0000 (00:54 +0000)]
partially-working site-creation
The permissions page is still messed up; and the creation UI is
awful. But it does generate a Site instance.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@910
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:54:04 +0000 (00:54 +0000)]
semi-mechanical translation from 'course' to 'site' inside files.
I'm sure I messed some things up, but it's much closer to being good!
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@909
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:53:57 +0000 (00:53 +0000)]
rename 'course' files to 'site'
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@908
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:53:47 +0000 (00:53 +0000)]
Dang, ReadingList is an awful model name. Starting over as Site; blow your test db away.
Sorry, the schema migration stuff can't handle this; at least I don't
think it's worth the contortions to make it try.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@907
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:53:40 +0000 (00:53 +0000)]
minor UI tweaks; introduced hook system for miscellaneous customizations.
The hook system is experimental; as the name suggests, it's a
mechanism for declaring and implementing hooks into various parts of
the application. Currently, I've just added one hook for determining
which users should be entitled to create new ReadingLists. We'll see
how it plays out.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@906
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:53:35 +0000 (00:53 +0000)]
external_id for service-desk should be NULLable. Schema change.
You'll need to run './manage.py migrate' to update an existing schema.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@905
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:53:20 +0000 (00:53 +0000)]
read app-title from 'application.title' config record
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@904
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:53:11 +0000 (00:53 +0000)]
first steps to getting navigation and admin-options working again.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@903
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:53:05 +0000 (00:53 +0000)]
Added 'south' dependency (for schema migration)
See http://south.aeracode.org/
http://south.aeracode.org/docs/tutorial/index.html
For your first database, you'll need to
./manage.py syncdb
as usual, and then
./manage.py migrate
to playback the series of schema migrations.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@902
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 15 Jul 2010 00:53:00 +0000 (00:53 +0000)]
Model/schema overhaul. These are breaking changes. Application broken.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@901
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 6 May 2010 01:24:37 +0000 (01:24 +0000)]
* conifer/syrup/views/_common.py: added @postmortem decorator
When settings.DEBUG == True, a function decorated with @postmortem
will drop the Python process into the interactive postmortem debugger
if an uncaught exception is raised. (See the 'pdb' stdlib module for
details.)
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@883
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 6 May 2010 01:24:34 +0000 (01:24 +0000)]
* conifer/integration/default.py: a better null implementation of course-sections.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@882
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Tue, 4 May 2010 01:53:20 +0000 (01:53 +0000)]
tiny little correction to merge 2010-02-campus-integration-reorg merge
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@879
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Tue, 4 May 2010 01:48:22 +0000 (01:48 +0000)]
Merged 2010-02-campus-integration-reorg branch changes r797:849 into trunk
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@878
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 25 Mar 2010 03:45:03 +0000 (03:45 +0000)]
Establish a formal, required local_settings file. Warn deployer if none exists.
I've moved all of our testing-specific stuff from settings into local_settings.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@845
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 25 Mar 2010 03:44:54 +0000 (03:44 +0000)]
removed out-of-sync comment.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@844
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 25 Mar 2010 03:44:44 +0000 (03:44 +0000)]
put HERE definition in its own module.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@843
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Fri, 26 Feb 2010 03:55:44 +0000 (03:55 +0000)]
Fix bug that made radio button circles into 100%-wide ovals.
To keep the text INPUTs and TEXTAREAs as wide as possible, but other
inputs small, I added a JavaScript snippet to ensure the text elements
have a CSS-addressable class ('text'); then I updated the stylesheet
to only set 'text' inputs 100% wide.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@803
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Fri, 22 Jan 2010 03:20:58 +0000 (03:20 +0000)]
fixed title-lookup during edit-course
The buggy version had a bad hard-coded prefix in the lookup-title
URL. I've added a ROOT variable in JavaScript, set to the URL prefix
(the SCRIPT_NAME) of the Syrup instance; and now we use this to
correctly find the lookup-title service.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@763
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Fri, 22 Jan 2010 02:48:02 +0000 (02:48 +0000)]
stripped out pesky Windows carriage returns
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@762
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
risard [Wed, 13 Jan 2010 22:30:15 +0000 (22:30 +0000)]
Added the sql developed from the rfc
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@756
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
artunit [Tue, 25 Aug 2009 02:59:32 +0000 (02:59 +0000)]
fixed department browse
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@633
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
artunit [Mon, 17 Aug 2009 14:23:07 +0000 (14:23 +0000)]
some help text and css changes
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@621
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
artunit [Mon, 17 Aug 2009 05:05:04 +0000 (05:05 +0000)]
whoops, add missing z3950 setup
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@620
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
artunit [Mon, 17 Aug 2009 04:37:09 +0000 (04:37 +0000)]
moved to trunk version of jquery to fix IE 8 issues, z39.50 moved over in lib_integration to pyz3950
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@619
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
artunit [Sun, 16 Aug 2009 11:39:54 +0000 (11:39 +0000)]
putting xslt files in static tree
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@618
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
artunit [Sun, 16 Aug 2009 11:38:50 +0000 (11:38 +0000)]
using xslt for formatting z39.50 results
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@617
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
artunit [Sat, 18 Jul 2009 03:09:46 +0000 (03:09 +0000)]
minor changes
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@591
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
artunit [Sat, 18 Jul 2009 01:14:47 +0000 (01:14 +0000)]
extracting yax and expect dependencies, some info on running under windows
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@590
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
artunit [Mon, 11 May 2009 02:32:18 +0000 (02:32 +0000)]
working out instructors more field
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@467
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 7 May 2009 00:35:15 +0000 (00:35 +0000)]
cleaned up links to marc/catalogue/reserves-entry in circ-needs list.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@462
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 7 May 2009 00:27:55 +0000 (00:27 +0000)]
Added link from circ-needs page to title-details in catalogue.
It's Evergreen-specific; that needs fixing.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@461
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 7 May 2009 00:15:54 +0000 (00:15 +0000)]
added preliminary 'Notify circ of wanted items' screen.
More work to be done on the backend query, as well as on the display
and possible export-format of data for circ.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@460
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 7 May 2009 00:15:51 +0000 (00:15 +0000)]
allow Syrup to start without EG integration; but warn that it's absent.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@459
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Wed, 6 May 2009 02:12:39 +0000 (02:12 +0000)]
Z39.50 madness! Now will paginate through all hits. Items with 856$9 added as URLs, not Physical Items.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@455
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Wed, 6 May 2009 00:01:08 +0000 (00:01 +0000)]
Cleaned up lib integration. Moved more lib settings to settings.py. Better UTF-8 support in z3950 search.
Still not perfect, but cleaner. Hard-coded references to EG server are
now in settings.py, as are the names of other servers (Z39.50, SIP).
I had been using a file called 'marctools' by Joel Hardi to do what
turned out to be basic UTF-8 encoding, so I've replaced his code with
a simple regex-based substitution (in yaz_search.py).
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@454
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Mon, 4 May 2009 02:21:23 +0000 (02:21 +0000)]
missed a go-back
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@449
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Mon, 4 May 2009 02:19:58 +0000 (02:19 +0000)]
add more 'go back/cancel' links; put consistent wording on them all
Beta testers noted that there were many places where a Go-back or
Cancel link was desirable. I've tried to add one in all the obvious
places.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@448
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Mon, 4 May 2009 01:33:07 +0000 (01:33 +0000)]
Added explanation-text for Resequence Items
Actually, this had been an earlier feature, but a typo had disabled
it. This version is a bit tighter anyway.
If you click on Resequence Items, a short explanatory message will
appear below the link.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@447
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Mon, 4 May 2009 01:17:16 +0000 (01:17 +0000)]
Users can now self-register for open-access courses.
Previously, all users could view the contents of open-access courses,
but could not register for them. Now there is an option to join an
open-access course, which adds the course to the user's My Courses
list.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@446
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Fri, 1 May 2009 01:40:02 +0000 (01:40 +0000)]
hard-coded reference to new z3950 server at Conifer (leddy target).
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@427
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Fri, 1 May 2009 01:25:24 +0000 (01:25 +0000)]
fixed 'Resequence' bug that was affecting Internet Explorer
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@426
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Mon, 27 Apr 2009 01:58:05 +0000 (01:58 +0000)]
cleaned up invitation page; fixed bug in bad-invitation handler.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@400
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Mon, 27 Apr 2009 01:58:00 +0000 (01:58 +0000)]
Changed "Add a new course site" to "Create a new course site".
Betty Ing suggested this, for consistency. I'm not sure that all the
other "Add a new" links should be changed to "Create a new"s,
though. Creating a course site makes sense to me; but you don't create
a term (though you might add a representation of one to the system).
Opinions welcome.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@399
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Mon, 27 Apr 2009 01:57:56 +0000 (01:57 +0000)]
added Y-M-D format cue to Add Term page (to model label, actually).
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@398
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Mon, 27 Apr 2009 00:15:48 +0000 (00:15 +0000)]
hm, item-search results should be DISTINCT.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@397
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Mon, 27 Apr 2009 00:07:11 +0000 (00:07 +0000)]
Enabled ANON courses. Search and browse results are now limited by user-permissions level.
ANON courses are courses which are open to non-authenticated
users. I'm not sure that this is a good idea yet, but it is useful for
testing.
Browsing will no longer show, for example, courses which the current
user cannot enter. Search will not return items that the current user
cannot view. This is extended to browse-instructors: if the instructor
has no accessible courses, don't bother showing the course.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@396
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Mon, 27 Apr 2009 00:07:07 +0000 (00:07 +0000)]
changed dwarf references to concat.ca refs. Danger, still too literal...
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@395
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Wed, 22 Apr 2009 01:18:45 +0000 (01:18 +0000)]
added TODOs, following a discussion with kgs
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@380
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Tue, 21 Apr 2009 23:50:07 +0000 (23:50 +0000)]
lose the PID in the masthead; change E-Reserves to Reserve.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@379
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Tue, 21 Apr 2009 23:46:30 +0000 (23:46 +0000)]
ensure that new items always appear at the end of their heading.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@378
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Tue, 21 Apr 2009 23:17:41 +0000 (23:17 +0000)]
fix big cannot-edit-item bug, caused by earlier reloc of all item-based templates.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@377
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 16 Apr 2009 00:29:58 +0000 (00:29 +0000)]
fixed bug in item_add_cat_search, due to move of templates.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@338
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 16 Apr 2009 00:26:04 +0000 (00:26 +0000)]
fixed error from my views reorganization: missing 'welcome'
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@337
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 16 Apr 2009 00:19:55 +0000 (00:19 +0000)]
moved item-related templates to templates/item/. Updated LICENSE notes; removed outdated .dat file.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@336
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 16 Apr 2009 00:09:02 +0000 (00:09 +0000)]
broke up our enormous views.py to several views/* submodules.
See the new README-VIEWS file for a quick overview.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@335
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 16 Apr 2009 00:06:14 +0000 (00:06 +0000)]
minor fixes; todo changes
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@334
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Wed, 15 Apr 2009 02:35:36 +0000 (02:35 +0000)]
tiny css tweak
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@332
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 9 Apr 2009 02:14:54 +0000 (02:14 +0000)]
tweak tweak
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@316
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 9 Apr 2009 02:02:24 +0000 (02:02 +0000)]
css tweaks
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@315
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 9 Apr 2009 01:59:48 +0000 (01:59 +0000)]
css tweaks
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@314
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Thu, 9 Apr 2009 01:48:20 +0000 (01:48 +0000)]
big CSS/HTML overhaul to make Syrup look okay in IE6 (hopefully IE7 too)
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@313
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Wed, 8 Apr 2009 23:13:41 +0000 (23:13 +0000)]
minor HTML adjustments; deleted an old template.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@312
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Wed, 8 Apr 2009 23:13:38 +0000 (23:13 +0000)]
CSS tweaks
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@311
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Wed, 8 Apr 2009 23:13:34 +0000 (23:13 +0000)]
added 'relocate' to 'about' pages for consistency. Changed 'put under heading' to 'relocate'.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@310
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Wed, 8 Apr 2009 19:20:17 +0000 (19:20 +0000)]
fixed more root-related problems
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@306
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Wed, 8 Apr 2009 02:32:10 +0000 (02:32 +0000)]
SIP robustness tweaks, TODO and other housekeeping.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@301
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Wed, 8 Apr 2009 01:43:41 +0000 (01:43 +0000)]
fixed more absolute-root problems. Introduced ROOT global Genshi variable.
ROOT can be used in templates: it has the value of the CGI variable
SCRIPT_NAME, so we can use it to determine what the root-prefix of the
app is.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@300
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Tue, 7 Apr 2009 02:08:57 +0000 (02:08 +0000)]
work in progress: fixing absolute /syrup/ root references.
Sorry for checking in partially-working code, but I don't want to list this.
Some /syrup/ root-prefixes are fixed; some are not. Note, this commit
will almost certainly break if running as './manage.py
runserver'. Using mod_python, it should still work:
<Location "/syrup/">
SetHandler python-program
PythonHandler django.core.handlers.modpython
SetEnv DJANGO_SETTINGS_MODULE conifer.settings
PythonOption django.root /syrup
PythonDebug Off
PythonPath "['/home/graham/projects/evergreen/servres/'] + sys.path"
</Location>
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@297
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Tue, 7 Apr 2009 01:42:22 +0000 (01:42 +0000)]
for better mod_python deployment, moving all URLs under /syrup/
That will change next! I will move them all up to a relative root, and
then Apache can decide what the root-prefix will be.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@296
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Mon, 6 Apr 2009 01:01:33 +0000 (01:01 +0000)]
added local fm_IDL.xml; may blow this away yet.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@293
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Mon, 6 Apr 2009 01:01:28 +0000 (01:01 +0000)]
baby steps toward a good mod_python deployment.
This works as is, with a overly-controlling Apache environment:
<Location "/">
SetHandler python-program
PythonHandler django.core.handlers.modpython
SetEnv DJANGO_SETTINGS_MODULE conifer.settings
#PythonOption django.root /syrup
PythonOption django.root
PythonDebug Off
PythonPath "['/home/graham/projects/evergreen/servres/'] + sys.path"
</Location>
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@292
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Mon, 6 Apr 2009 01:01:12 +0000 (01:01 +0000)]
TODO updates.
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@291
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Mon, 6 Apr 2009 01:01:06 +0000 (01:01 +0000)]
style tweak
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@290
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Mon, 6 Apr 2009 01:01:04 +0000 (01:01 +0000)]
fixed bug with paginator on search-results
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@289
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
gfawcett [Sun, 5 Apr 2009 23:49:10 +0000 (23:49 +0000)]
tweaks
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@287
6d9bc8c9-1ec2-4278-b937-
99fde70a366f
projects / Syrup.git / log