Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ssp 973 elective manager #5

Closed
wants to merge 12 commits into from
Closed

Ssp 973 elective manager #5

wants to merge 12 commits into from

Conversation

tbain
Copy link
Contributor

@tbain tbain commented Apr 29, 2013

I think this is ready to merge in, I ran this on my local machine and it's working correctly.

tbain and others added 11 commits April 11, 2013 16:04
Let's us avoid changing the convention on reference data controller
getAll() methods which by default filter out soft-deleted entities.
Client-side benefits from this calculated boolean field b/c it's
easier to bind to a checkbox. But it's just noise on the back end.
Clicking 'Add' on the 'Electives Type' admin form was blowing up.
Still don't fully understand what was going on, but seems the
'record.set()' calls I was using to sync up these two fields are
dangerous when the object isn't yet bound to a store. Not clear
to me when exactly that happens... must be just after initialization
b/c set() is still being called before
AbstractReferenceAdminViewController.addRecord() ever does anything
to add the model instance it creates to a store explicitly. In
any event... the fix was basically to try to detect when we're in
initialization and skip the explicitly synchronization. As long
as Ext.js guarantees that fields are initialized in the same way
and order in which they're set during deserialization (which does
seem to be the case), this just happens to work fine...
SSP-973_Elective-Manager

Conflicts:
	src/main/resources/org/jasig/ssp/database/masterChangeLog.xml
	src/main/webapp/app/controller/AdminViewController.js
	src/main/webapp/app/controller/admin/AbstractReferenceAdminViewController.js
	src/main/webapp/app/store/admin/AdminTreeMenus.js
@dmccallum
Copy link
Member

Thanks. Will merge this in after cutting the 2.0.0b1 release branch.

@dmccallum
Copy link
Member

This has been squashed and merged as 5311af6

I made a few changes in there, including:

  1. Complete removal of the "storeLoadOptions" feature, which was no longer in actual use and had problems anyway, as discussed on list. TagController now returns all records by default, just like ElectiveController.

  2. Suppression of the "dirty flags" in the grid view. This involved some refactoring to the way AbstractReferenceAdmin#initComponent was initializing itself. Previously the Ext.apply() call there was blowing away any viewConfig that might have been set in the constructor.

I did notice a few issues during testing. These have all been linked to https://issues.jasig.org/browse/SSP-973. I did try to verify that the SSP-973_Elective-Manager branch has the same problems, but in case these issues are regressions introduced by my changes or the merge process, I'm going to keep that branch around for a while as a reference point.

@dmccallum dmccallum closed this May 3, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants