Commit Graph

158 Commits

Author SHA1 Message Date
Chris Dodge
a80e8ce3d5 respond to Cale pull request comments. Update access.py (LMS) to use the same 'check for legacy group name first' logic. Add SECRET_KEY setting to the CAS project so that auth tokens from CAS are accepted in the LMS 2012-10-09 15:11:07 -04:00
Chris Dodge
68945fdc77 adhere to the naming conventions of user groups (instructor_* and staff_* of the LMS AuthZ implementation). While we're keeping our authz.py implementation - which is duplicative of LMS's access.py - in order to minimize code churn/risk-of-regression, there is data compatibility so the two systems will interpret the data the same way 2012-10-09 13:14:31 -04:00
Chris Dodge
d55769861e check if 'delete metadata field' is not in the list of system metadata 2012-10-05 14:45:07 -04:00
Chris Dodge
95e15c4455 time/date setting on Release Date and Due date 2012-10-05 13:17:51 -04:00
Chris Dodge
758c446929 wip on setting date/times on subsection page 2012-10-05 09:56:07 -04:00
Chris Dodge
fe42f6fd22 address pull request feedback 2012-10-04 14:00:25 -04:00
Chris Dodge
29c142e3dc need to wire through the new unit template location to the edit unit page 2012-10-04 11:09:28 -04:00
Chris Dodge
322c4c0ba6 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/templates/widgets/units.html
2012-10-04 11:03:37 -04:00
Chris Dodge
45b82f3a45 update creating a new unit to use an empty template. Also twiddle the units.html and base.js where we put the unit Location on the <li> element 2012-10-04 10:58:48 -04:00
chrisndodge
ab7377dc98 Merge pull request #819 from MITx/feature/cale/cas-unit-location-view
Wire up the unit location display
2012-10-04 07:57:11 -07:00
Tom Giannattasio
92e830df24 more explicit temporary status on landing page 2012-10-04 10:37:46 -04:00
Tom Giannattasio
6b4d9ba0cd setup landing template 2012-10-03 17:26:14 -04:00
Chris Dodge
1240325c69 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page
Conflicts:
	cms/static/js/base.js
2012-10-03 16:24:38 -04:00
Chris Dodge
5390a19fc0 delete unit in overview and subsection_edit pages 2012-10-03 16:19:14 -04:00
Calen Pennington
a6cf7cb0c2 Merge pull request #817 from MITx/feature/tomg/cms-library
Feature/tomg/cms library
2012-10-03 12:21:55 -07:00
Calen Pennington
55d6aff4c1 Wire up the unit location display 2012-10-03 14:54:17 -04:00
Calen Pennington
d80c931772 Hook up the component delete button to the backend. Don't break if the process of updating a parent unit after deleting is interrupted (leaving a pointer to a missing module) 2012-10-03 14:24:11 -04:00
Calen Pennington
79a7cc9f03 Don't send back a preview when saving an item 2012-10-03 14:24:11 -04:00
Chris Dodge
711dc55c73 add subsection edit page to the project with a shared 'unit' widget that will render out unit lists. Both edit_subsection and overview.html will share this widget 2012-10-03 14:16:23 -04:00
Chris Dodge
a0b3fb0ec5 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page 2012-10-03 12:40:55 -04:00
Chris Dodge
e24dcaead6 initial subsection page converted from static HTML mockup 2012-10-03 10:44:20 -04:00
Chris Dodge
fb204084a2 for get_all_content_info_for_course(), return a list of the MongoDB query rather than a cursor object. Also add some documentation (in a comment) as to what a caller should expect 2012-10-03 09:24:48 -04:00
Chris Dodge
eb7d6c656c use better encapsulation for the naming convention behind thumbnails. Put it all in content.py rather than view.py. 2012-10-03 09:17:18 -04:00
Chris Dodge
84bc81f7eb refactor StaticContent id scheme to be the same as moduledata. Also expose a new 'get all content for course' which will be needed to support a asset management page. 2012-10-03 09:07:09 -04:00
Tom Giannattasio
44d4a4b0d9 started asset library template -wip 2012-10-02 17:02:47 -04:00
Chris Dodge
a570702ae3 add a new subsection edit url map and reference it in the course summary page 2012-10-02 16:22:26 -04:00
Chris Dodge
e3d065a66a allow 'is_staff' flagged user accounts to run as super-admin, which means belonging to all groups 2012-10-02 12:33:05 -04:00
Calen Pennington
91eb2cf983 Merge pull request #804 from MITx/fix/cdodge/cms-multiple-edit-save-bug
fix bug with editing HTML. The save() method should now return a diction...
2012-10-02 09:14:41 -07:00
Calen Pennington
aff44b1f11 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
Conflicts:
	cms/djangoapps/contentstore/views.py
2012-10-02 12:12:55 -04:00
Chris Dodge
a60ec13d3a fix bug with editing HTML. The save() method should now return a dictionary, not a string 2012-10-02 11:58:24 -04:00
Calen Pennington
1d8d82b7fc Set id's on newly created components so that they are immediately editable 2012-10-01 16:06:18 -04:00
Calen Pennington
f4b8bfe428 Turn off dumping the course back into git 2012-10-01 15:32:29 -04:00
Calen Pennington
91fd6170b8 Make cloned items used uuid4 hexes for names, to ensure uniqueness. TODO: Make prettier names 2012-10-01 15:28:12 -04:00
Calen Pennington
bfeccd88f8 Enable creation of new components 2012-10-01 15:28:07 -04:00
Calen Pennington
8ca10a8356 Separate unit page from vertical implementation for editing 2012-10-01 15:19:35 -04:00
Calen Pennington
82a28f069d Make overview page conform to section/subsection/unit format. Breaks CMS editing of existing courses 2012-10-01 15:18:50 -04:00
Calen Pennington
b305c0bae2 Make drag/drop save content immediately in seqs and verticals 2012-10-01 15:17:41 -04:00
Calen Pennington
ce3638538c Make inline editing save to mongo and then update the preview 2012-10-01 15:17:41 -04:00
Calen Pennington
dc062f5668 Make edit and delete buttons show up on cms unit editing page 2012-10-01 15:17:41 -04:00
Calen Pennington
8a131446fe First pass at integrating the new unit editing wireframes with the CMS 2012-10-01 15:17:40 -04:00
Calen Pennington
d534855b54 Make the overview page pull data from the db, rather than static content 2012-10-01 15:16:30 -04:00
Chris Dodge
116c7ed31d fix typo bug on PermissionDenied exception raising 2012-10-01 15:14:16 -04:00
Chris Dodge
d241d5553c add error response when trying to remove a user which does not exist 2012-10-01 15:14:16 -04:00
Chris Dodge
ea8e875d7d fix url mapping bug in url.py and include import reference to remove_user_from_course_group 2012-10-01 15:14:16 -04:00
Chris Dodge
580e620b22 add distinct 'admin' role separate from 'editors'. Only 'admins' should be able to add/remove editors. 2012-10-01 15:13:20 -04:00
Chris Dodge
27016465f4 support some simple authorization scheme to view/edit courses 2012-10-01 15:13:19 -04:00
Calen Pennington
ea8ab0f809 Add basic overview.html from tom's wireframe to CMS 2012-10-01 15:12:29 -04:00
Chris Dodge
1ee7646cfc per feedback, use reverse() when generating callback urls. Also generate thumbnails when ingesting static images. We'll need these handy for the CMS UI. 2012-09-28 10:20:57 -04:00
Chris Dodge
adad3c550b Support asset library references in CapaModule. Also some code refactoring/cleanup. Preparing for review and submit 2012-09-27 12:31:45 -04:00
Chris Dodge
39e64c1e56 work in progress. Need to commit before rebasing to master 2012-09-27 10:24:53 -04:00