Commit Graph

9424 Commits

Author SHA1 Message Date
Brian Talbot
4a2b5519ba Studio: styles new user role controls and revamps course team UI 2013-07-29 13:12:05 -04:00
David Baumgold
a1b44afda3 Only instructors may make other instructors on a course 2013-07-29 13:12:05 -04:00
David Baumgold
42331464ed Can't remove last instructor of a course 2013-07-29 13:12:05 -04:00
David Baumgold
79c554ba5b course admin team: handle is_staff users
A user with `is_staff=True` is treated as being in all groups. This is problematic
when we care about the user's staff/instructor role for a course: you can't remove
the instructor role. This commit changes the `is_user_in_course_group_role` function
to allow the caller to specify that it should not check the `is_staff` attribute
on the user.
2013-07-29 13:12:05 -04:00
David Baumgold
b6c69547de Check for instructor role before removing it 2013-07-29 13:12:04 -04:00
David Baumgold
c70bd5c908 Remove whitespace from email addresses on the course team page 2013-07-29 13:12:04 -04:00
David Baumgold
0682157477 Test manage_users view for user that is a member of the course team 2013-07-29 13:12:04 -04:00
David Baumgold
f438552b3b Added unit tests for new course team API 2013-07-29 13:12:04 -04:00
David Baumgold
97a02d415f Make assertion failure message more understandable 2013-07-29 13:12:04 -04:00
David Baumgold
724ef2e1e5 Fixing test failures 2013-07-29 13:12:04 -04:00
David Baumgold
b835f7c3a3 Update a manage_user reverse call 2013-07-29 13:11:48 -04:00
David Baumgold
6a9074e185 Removed get_url_reverse function
It was causing unit tests to fail, and it's a needless bit of abstraction that
never should have existed in the first place.
2013-07-29 13:11:48 -04:00
David Baumgold
5c356bd379 Add button to add/remove instructor priviledges on course team page 2013-07-29 13:11:48 -04:00
David Baumgold
21a32370df Reorganize URLs and views around course team
Match other views better, saner URLs, more RESTful style, extensible for other roles
2013-07-29 13:11:48 -04:00
David Baumgold
c240f6597d Reformat JS 2013-07-29 13:11:47 -04:00
cahrens
b5506cf20b Copy changes. 2013-07-29 09:51:10 -04:00
cahrens
15665bbe5a Formatting updates. 2013-07-29 09:49:37 -04:00
cahrens
23894d20f8 E-mail notifications to users when course creator status changes. 2013-07-29 09:49:37 -04:00
Vasyl Nakvasiuk
57bc010a0a gst integration into studio 2013-07-26 17:22:27 +03:00
Christina Roberts
166aea62bb Merge pull request #341 from edx/talbs/studio-authorship
Studio: Authorship Rights Request UI + Dashboard Clean-up
2013-07-26 03:59:07 -07:00
Brian Talbot
8a715c1a16 Studio: using defined red color variables for error-based system messages 2013-07-25 17:09:57 -04:00
Sarina Canelake
50d35b30b1 Fix failing acceptance test 2013-07-25 14:56:22 -04:00
David Baumgold
df1252901f Misc improvements to make lettuce testing a bit saner 2013-07-25 13:19:39 -04:00
cahrens
628994daf1 i18n "Create a New Course". 2013-07-25 12:25:06 -04:00
cahrens
60d60de2c4 Use format for strings instead of %. 2013-07-25 12:21:17 -04:00
ihoover
aad6dc4345 Merge pull request #417 from edx/ihoover/feature_flag_auto_auth
Ihoover/feature flag auto auth
2013-07-25 08:11:22 -07:00
Adam Palay
2efcb0cdca Change default names for various LMS components
Embedded discussion component defaults to "Discussion"
Blank HTML page defaults to "Text"
Video component defaults to "Video"

These default names show up in tooltips.
2013-07-25 10:38:47 -04:00
ihoover
56883d65a1 csrf test fix
remove test that csrf middleware is disabled (since we can't seem to reload middleware between tests)

move definitions from setuo into test method
2013-07-24 17:08:18 -04:00
Calen Pennington
76055aa211 Add a manage.py command that understands the extra edX options 2013-07-24 09:04:12 -04:00
ihoover
c6c3e4b9d3 working under cms too 2013-07-23 16:23:54 -04:00
Chris Dodge
0b6932f4b8 add new test to assert that course creation will populate default tabs as expected. Also update factory to not override defaults on tabs array. Also simplfy self.tab test condition. 2013-07-23 16:15:39 -04:00
chrisndodge
b76e7387aa Merge pull request #452 from edx/feature/cdodge/add-jump-to-substituions
add a /jump_to_id/ shortcut for producing more durable links between cou...
2013-07-23 12:15:31 -07:00
jkarni
3a5e1c7021 Merge pull request #463 from edx/fix/jkarni/linkoutline
Link section to course outline
2013-07-23 10:59:11 -07:00
Brian Talbot
059450c0de Studio: revises HTML and styling around new unit ID on unit view 2013-07-23 12:10:49 -04:00
Chris Dodge
1c79b9c874 add a /jump_to_id/ shortcut for producing more durable links between courseware in Studio 2013-07-23 12:10:49 -04:00
Peter Fogg
6eac259c08 Merge pull request #415 from edx/peter-fogg/notification-stories
Peter fogg/notification stories
2013-07-23 09:05:10 -07:00
Peter Fogg
69e8d4d32f Merge pull request #469 from edx/peter-fogg/fix-stud-486
Trim whitespace when adding course authors.
2013-07-23 09:01:25 -07:00
Brian Talbot
1da5af53d9 Studio: revises styling/message copy for authorship rights request error 2013-07-23 10:37:07 -04:00
cahrens
3d49a46197 Add error handler. 2013-07-23 10:16:45 -04:00
David Baumgold
89705f275d Merge pull request #461 from edx/db/change-asset-to-pdf
Change "asset" to "PDF" in textbooks interface
2013-07-23 06:49:39 -07:00
Brian Talbot
0833181ecc Studio: updates older extend references and solves Sass warnings/dupe display of accessibility-based text 2013-07-22 16:30:26 -04:00
Brian Talbot
4a3b680ee6 Merge pull request #447 from edx/talbs/studio-fix-title
Studio: adds a space back to the phrase 'Welcome to edX Studio'
2013-07-22 13:27:46 -07:00
Peter Fogg
060b2e17e5 Trim whitespace when adding course authors. 2013-07-22 15:58:22 -04:00
Peter Fogg
d87dba9e04 Correctly persist checklist settings.
Incidentally, fixes an acceptance test (which would have caught this
bug) not running. Its step regex was "They are correctly selected
after I reload the page$", which happens to be matched by "I reload
the page$", another step definition. Lettuce seems to arbitrarily pick
between definitions if they both match a step, so it's good to ensure
that each step isn't a sub-regexes of another.
2013-07-22 15:10:59 -04:00
cahrens
5168a080ff Don't add users marked with is_staff to course creation table. 2013-07-22 14:45:22 -04:00
Julian Arni
4f9a290a32 Link section to course outline 2013-07-22 14:26:47 -04:00
David Baumgold
ca2bb0e850 PDF Upload button now refers to "PDF" rather than "asset" 2013-07-22 12:54:31 -04:00
David Baumgold
b51aa31231 PDF uploader dialog refers to "PDF" instead of "asset" 2013-07-22 12:54:16 -04:00
Peter Fogg
e3e6fd2002 Remove commented-out code and add test. 2013-07-22 12:33:01 -04:00
cahrens
6629d5d3a3 Merge branch 'master' into talbs/studio-authorship
Conflicts:
	cms/djangoapps/contentstore/views/user.py
	cms/static/sass/elements/_controls.scss
	cms/templates/activation_active.html
	cms/templates/activation_complete.html
	cms/templates/activation_invalid.html
2013-07-22 12:15:42 -04:00