From 75f8b7c98d17d542c007da56114a6d984faec42b Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Thu, 4 Oct 2012 10:44:18 -0400 Subject: [PATCH 01/29] Add Draft module store that is used whenever any item is update in the CAS (but not during import, and not for templates) --- .../management/commands/import.py | 2 +- cms/envs/dev.py | 22 +-- .../xmodule/xmodule/modulestore/__init__.py | 4 +- .../lib/xmodule/xmodule/modulestore/draft.py | 128 ++++++++++++++++++ .../lib/xmodule/xmodule/modulestore/mongo.py | 6 + common/lib/xmodule/xmodule/templates.py | 6 +- 6 files changed, 155 insertions(+), 13 deletions(-) create mode 100644 common/lib/xmodule/xmodule/modulestore/draft.py diff --git a/cms/djangoapps/contentstore/management/commands/import.py b/cms/djangoapps/contentstore/management/commands/import.py index 1d15f1e7df..a8ec2c2685 100644 --- a/cms/djangoapps/contentstore/management/commands/import.py +++ b/cms/djangoapps/contentstore/management/commands/import.py @@ -26,4 +26,4 @@ class Command(BaseCommand): print "Importing. Data_dir={data}, course_dirs={courses}".format( data=data_dir, courses=course_dirs) - import_from_xml(modulestore(), data_dir, course_dirs, load_error_modules=False) + import_from_xml(modulestore('direct'), data_dir, course_dirs, load_error_modules=False) diff --git a/cms/envs/dev.py b/cms/envs/dev.py index 8401fa5c15..e5548df2d4 100644 --- a/cms/envs/dev.py +++ b/cms/envs/dev.py @@ -14,17 +14,23 @@ LOGGING = get_logger_config(ENV_ROOT / "log", tracking_filename="tracking.log", debug=True) +modulestore_options = { + 'default_class': 'xmodule.raw_module.RawDescriptor', + 'host': 'localhost', + 'db': 'xmodule', + 'collection': 'modulestore', + 'fs_root': GITHUB_REPO_ROOT, + 'render_template': 'mitxmako.shortcuts.render_to_string', +} + MODULESTORE = { 'default': { + 'ENGINE': 'xmodule.modulestore.mongo.DraftMongoModuleStore', + 'OPTIONS': modulestore_options + }, + 'direct': { 'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore', - 'OPTIONS': { - 'default_class': 'xmodule.raw_module.RawDescriptor', - 'host': 'localhost', - 'db': 'xmodule', - 'collection': 'modulestore', - 'fs_root': GITHUB_REPO_ROOT, - 'render_template': 'mitxmako.shortcuts.render_to_string', - } + 'OPTIONS': modulestore_options } } diff --git a/common/lib/xmodule/xmodule/modulestore/__init__.py b/common/lib/xmodule/xmodule/modulestore/__init__.py index 880159d8ed..3ee83449f9 100644 --- a/common/lib/xmodule/xmodule/modulestore/__init__.py +++ b/common/lib/xmodule/xmodule/modulestore/__init__.py @@ -345,7 +345,9 @@ class ModuleStore(object): Returns a list containing the top level XModuleDescriptors of the courses in this modulestore. ''' - raise NotImplementedError + # TODO (vshnayder): Why do I have to specify i4x here? + course_filter = Location("i4x", category="course") + return self.get_items(course_filter) def get_parent_locations(self, location): '''Find all locations that are the parents of this location. Needed diff --git a/common/lib/xmodule/xmodule/modulestore/draft.py b/common/lib/xmodule/xmodule/modulestore/draft.py new file mode 100644 index 0000000000..6293063ffa --- /dev/null +++ b/common/lib/xmodule/xmodule/modulestore/draft.py @@ -0,0 +1,128 @@ + +from . import ModuleStoreBase, Location +from .exceptions import ItemNotFoundError + + +class DraftModuleStore(ModuleStoreBase): + """ + This mixin modifies a modulestore to give it draft semantics. + That is, edits made to units are stored to locations that have the revision 'draft', + and when reads are made, they first read with revision 'draft', and then fall back + to the baseline revision only if 'draft' doesn't exist. + + This module also includes functionality to promote 'draft' modules (and optionally + their children) to published modules. + """ + + def get_item(self, location, depth=0): + """ + Returns an XModuleDescriptor instance for the item at location. + If location.revision is None, returns the item with the most + recent revision + + If any segment of the location is None except revision, raises + xmodule.modulestore.exceptions.InsufficientSpecificationError + + If no object is found at that location, raises + xmodule.modulestore.exceptions.ItemNotFoundError + + location: Something that can be passed to Location + + depth (int): An argument that some module stores may use to prefetch + descendents of the queried modules for more efficient results later + in the request. The depth is counted in the number of calls to + get_children() to cache. None indicates to cache all descendents + """ + try: + return super(DraftModuleStore, self).get_item(Location(location)._replace(revision='draft'), depth) + except ItemNotFoundError: + return super(DraftModuleStore, self).get_item(location, depth) + + def get_instance(self, course_id, location): + """ + Get an instance of this location, with policy for course_id applied. + TODO (vshnayder): this may want to live outside the modulestore eventually + """ + try: + return super(DraftModuleStore, self).get_instance(course_id, Location(location)._replace(revision='draft')) + except ItemNotFoundError: + return super(DraftModuleStore, self).get_instance(course_id, location) + + def get_items(self, location, depth=0): + """ + Returns a list of XModuleDescriptor instances for the items + that match location. Any element of location that is None is treated + as a wildcard that matches any value + + location: Something that can be passed to Location + + depth: An argument that some module stores may use to prefetch + descendents of the queried modules for more efficient results later + in the request. The depth is counted in the number of calls to + get_children() to cache. None indicates to cache all descendents + """ + draft_loc = Location(location)._replace(revision='draft') + draft_items = super(DraftModuleStore, self).get_items(draft_loc, depth) + items = super(DraftModuleStore, self).get_items(location, depth) + + draft_locs_found = set(item.location._replace(revision=None) for item in draft_items) + non_draft_items = [ + item + for item in items + if (item.location.revision != 'draft' + and item.location._replace(revision=None) not in draft_locs_found) + ] + return draft_items + non_draft_items + + def clone_item(self, source, location): + """ + Clone a new item that is a copy of the item at the location `source` + and writes it to `location` + """ + return super(DraftModuleStore, self).clone_item(source, Location(location)._replace(revision='draft')) + + def update_item(self, location, data): + """ + Set the data in the item specified by the location to + data + + location: Something that can be passed to Location + data: A nested dictionary of problem data + """ + return super(DraftModuleStore, self).update_item(Location(location)._replace(revision='draft'), data) + + def update_children(self, location, children): + """ + Set the children for the item specified by the location to + children + + location: Something that can be passed to Location + children: A list of child item identifiers + """ + return super(DraftModuleStore, self).update_children(Location(location)._replace(revision='draft'), children) + + def update_metadata(self, location, metadata): + """ + Set the metadata for the item specified by the location to + metadata + + location: Something that can be passed to Location + metadata: A nested dictionary of module metadata + """ + return super(DraftModuleStore, self).update_metadata(Location(location)._replace(revision='draft'), metadata) + + def delete_item(self, location): + """ + Delete an item from this modulestore + + location: Something that can be passed to Location + """ + return super(DraftModuleStore, self).delete_item(Location(location)._replace(revision='draft')) + + def get_parent_locations(self, location): + '''Find all locations that are the parents of this location. Needed + for path_to_location(). + + returns an iterable of things that can be passed to Location. + ''' + return super(DraftModuleStore, self).get_parent_locations(Location(location)._replace(revision='draft')) diff --git a/common/lib/xmodule/xmodule/modulestore/mongo.py b/common/lib/xmodule/xmodule/modulestore/mongo.py index 21e28e9d67..1e203c6a78 100644 --- a/common/lib/xmodule/xmodule/modulestore/mongo.py +++ b/common/lib/xmodule/xmodule/modulestore/mongo.py @@ -13,6 +13,7 @@ from xmodule.mako_module import MakoDescriptorSystem from xmodule.error_module import ErrorDescriptor from . import ModuleStoreBase, Location +from .draft import DraftModuleStore from .exceptions import (ItemNotFoundError, DuplicateItemError) @@ -341,3 +342,8 @@ class MongoModuleStore(ModuleStoreBase): are loaded on demand, rather than up front """ return {} + + +# DraftModuleStore is first, because it needs to intercept calls to MongoModuleStore +class DraftMongoModuleStore(DraftModuleStore, MongoModuleStore): + pass diff --git a/common/lib/xmodule/xmodule/templates.py b/common/lib/xmodule/xmodule/templates.py index 2937cddea6..41b1523709 100644 --- a/common/lib/xmodule/xmodule/templates.py +++ b/common/lib/xmodule/xmodule/templates.py @@ -75,6 +75,6 @@ def update_templates(): ), exc_info=True) continue - modulestore().update_item(template_location, template.data) - modulestore().update_children(template_location, template.children) - modulestore().update_metadata(template_location, template.metadata) + modulestore('direct').update_item(template_location, template.data) + modulestore('direct').update_children(template_location, template.children) + modulestore('direct').update_metadata(template_location, template.metadata) From 8da372344542af5a484a3b6f2843dbc4093c13a0 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Thu, 4 Oct 2012 11:22:52 -0400 Subject: [PATCH 02/29] Clone the full item as a draft if it doesn't already exist when doing a draft editing operation --- .../lib/xmodule/xmodule/modulestore/draft.py | 45 +++++++++++++------ 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/common/lib/xmodule/xmodule/modulestore/draft.py b/common/lib/xmodule/xmodule/modulestore/draft.py index 6293063ffa..12173ad13d 100644 --- a/common/lib/xmodule/xmodule/modulestore/draft.py +++ b/common/lib/xmodule/xmodule/modulestore/draft.py @@ -2,15 +2,17 @@ from . import ModuleStoreBase, Location from .exceptions import ItemNotFoundError +DRAFT = 'draft' + class DraftModuleStore(ModuleStoreBase): """ This mixin modifies a modulestore to give it draft semantics. - That is, edits made to units are stored to locations that have the revision 'draft', - and when reads are made, they first read with revision 'draft', and then fall back - to the baseline revision only if 'draft' doesn't exist. + That is, edits made to units are stored to locations that have the revision DRAFT, + and when reads are made, they first read with revision DRAFT, and then fall back + to the baseline revision only if DRAFT doesn't exist. - This module also includes functionality to promote 'draft' modules (and optionally + This module also includes functionality to promote DRAFT modules (and optionally their children) to published modules. """ @@ -34,7 +36,7 @@ class DraftModuleStore(ModuleStoreBase): get_children() to cache. None indicates to cache all descendents """ try: - return super(DraftModuleStore, self).get_item(Location(location)._replace(revision='draft'), depth) + return super(DraftModuleStore, self).get_item(Location(location)._replace(revision=DRAFT), depth) except ItemNotFoundError: return super(DraftModuleStore, self).get_item(location, depth) @@ -44,7 +46,7 @@ class DraftModuleStore(ModuleStoreBase): TODO (vshnayder): this may want to live outside the modulestore eventually """ try: - return super(DraftModuleStore, self).get_instance(course_id, Location(location)._replace(revision='draft')) + return super(DraftModuleStore, self).get_instance(course_id, Location(location)._replace(revision=DRAFT)) except ItemNotFoundError: return super(DraftModuleStore, self).get_instance(course_id, location) @@ -61,7 +63,7 @@ class DraftModuleStore(ModuleStoreBase): in the request. The depth is counted in the number of calls to get_children() to cache. None indicates to cache all descendents """ - draft_loc = Location(location)._replace(revision='draft') + draft_loc = Location(location)._replace(revision=DRAFT) draft_items = super(DraftModuleStore, self).get_items(draft_loc, depth) items = super(DraftModuleStore, self).get_items(location, depth) @@ -69,7 +71,7 @@ class DraftModuleStore(ModuleStoreBase): non_draft_items = [ item for item in items - if (item.location.revision != 'draft' + if (item.location.revision != DRAFT and item.location._replace(revision=None) not in draft_locs_found) ] return draft_items + non_draft_items @@ -79,7 +81,7 @@ class DraftModuleStore(ModuleStoreBase): Clone a new item that is a copy of the item at the location `source` and writes it to `location` """ - return super(DraftModuleStore, self).clone_item(source, Location(location)._replace(revision='draft')) + return super(DraftModuleStore, self).clone_item(source, Location(location)._replace(revision=DRAFT)) def update_item(self, location, data): """ @@ -89,7 +91,12 @@ class DraftModuleStore(ModuleStoreBase): location: Something that can be passed to Location data: A nested dictionary of problem data """ - return super(DraftModuleStore, self).update_item(Location(location)._replace(revision='draft'), data) + draft_loc = Location(location)._replace(revision=DRAFT) + draft_item = self.get_item(location) + if draft_item.location.revision != DRAFT: + self.clone_item(location, draft_loc) + + return super(DraftModuleStore, self).update_item(draft_loc, data) def update_children(self, location, children): """ @@ -99,7 +106,12 @@ class DraftModuleStore(ModuleStoreBase): location: Something that can be passed to Location children: A list of child item identifiers """ - return super(DraftModuleStore, self).update_children(Location(location)._replace(revision='draft'), children) + draft_loc = Location(location)._replace(revision=DRAFT) + draft_item = self.get_item(location) + if draft_item.location.revision != DRAFT: + self.clone_item(location, draft_loc) + + return super(DraftModuleStore, self).update_children(draft_loc, children) def update_metadata(self, location, metadata): """ @@ -109,7 +121,12 @@ class DraftModuleStore(ModuleStoreBase): location: Something that can be passed to Location metadata: A nested dictionary of module metadata """ - return super(DraftModuleStore, self).update_metadata(Location(location)._replace(revision='draft'), metadata) + draft_loc = Location(location)._replace(revision=DRAFT) + draft_item = self.get_item(location) + if draft_item.location.revision != DRAFT: + self.clone_item(location, draft_loc) + + return super(DraftModuleStore, self).update_metadata(draft_loc, metadata) def delete_item(self, location): """ @@ -117,7 +134,7 @@ class DraftModuleStore(ModuleStoreBase): location: Something that can be passed to Location """ - return super(DraftModuleStore, self).delete_item(Location(location)._replace(revision='draft')) + return super(DraftModuleStore, self).delete_item(Location(location)._replace(revision=DRAFT)) def get_parent_locations(self, location): '''Find all locations that are the parents of this location. Needed @@ -125,4 +142,4 @@ class DraftModuleStore(ModuleStoreBase): returns an iterable of things that can be passed to Location. ''' - return super(DraftModuleStore, self).get_parent_locations(Location(location)._replace(revision='draft')) + return super(DraftModuleStore, self).get_parent_locations(Location(location)._replace(revision=DRAFT)) From 1a8532d8ad595a4d8ce6f4a9950fcba621eb574c Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Thu, 4 Oct 2012 14:29:24 -0400 Subject: [PATCH 03/29] Make it possible to create, edit, and publish a draft --- cms/djangoapps/contentstore/utils.py | 22 +++++++++++ cms/djangoapps/contentstore/views.py | 39 +++++++++++++++++-- .../coffee/src/views/module_edit.coffee | 4 +- cms/static/coffee/src/views/unit.coffee | 35 +++++++++++++++-- cms/static/sass/_unit.scss | 33 ++++++++++++++++ cms/templates/unit.html | 21 ++++------ cms/urls.py | 2 + .../lib/xmodule/xmodule/modulestore/draft.py | 16 ++++---- lms/envs/cms/dev.py | 22 +++++++---- 9 files changed, 156 insertions(+), 38 deletions(-) diff --git a/cms/djangoapps/contentstore/utils.py b/cms/djangoapps/contentstore/utils.py index 4000f011ba..f103c74a8d 100644 --- a/cms/djangoapps/contentstore/utils.py +++ b/cms/djangoapps/contentstore/utils.py @@ -1,6 +1,9 @@ from django.conf import settings from xmodule.modulestore import Location from xmodule.modulestore.django import modulestore +from xmodule.modulestore.draft import DRAFT +from xmodule.modulestore.exceptions import ItemNotFoundError + def get_course_location_for_item(location): ''' @@ -45,3 +48,22 @@ def get_lms_link_for_item(item): return lms_link + +def compute_unit_state(unit): + """ + Returns whether this unit is 'draft', 'public', or 'private'. + + 'draft' content is in the process of being edited, but still has a previous + version visible in the LMS + 'public' content is locked and visible in the LMS + 'private' content is editabled and not visible in the LMS + """ + + if unit.location.revision == DRAFT: + try: + modulestore('direct').get_item(unit.location._replace(revision=None)) + return 'draft' + except ItemNotFoundError: + return 'private' + else: + return 'public' diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py index 190b463383..cf60de7937 100644 --- a/cms/djangoapps/contentstore/views.py +++ b/cms/djangoapps/contentstore/views.py @@ -43,7 +43,7 @@ from cache_toolbox.core import set_cached_content, get_cached_content, del_cache from auth.authz import is_user_in_course_group_role, get_users_in_course_group_by_role from auth.authz import get_user_by_email, add_user_to_course_group, remove_user_from_course_group from auth.authz import INSTRUCTOR_ROLE_NAME, STAFF_ROLE_NAME -from .utils import get_course_location_for_item, get_lms_link_for_item +from .utils import get_course_location_for_item, get_lms_link_for_item, compute_unit_state from xmodule.templates import all_templates @@ -210,6 +210,8 @@ def edit_unit(request, location): containing_section_locs = modulestore().get_parent_locations(containing_subsection.location) containing_section = modulestore().get_item(containing_section_locs[0]) + unit_state = compute_unit_state(item) + return render_to_response('unit.html', { 'unit': item, 'components': components, @@ -217,7 +219,9 @@ def edit_unit(request, location): 'lms_link': lms_link, 'subsection': containing_subsection, 'section': containing_section, - 'create_new_unit_template': Location('i4x', 'edx', 'templates', 'vertical', 'Empty') + 'create_new_unit_template': Location('i4x', 'edx', 'templates', 'vertical', 'Empty'), + 'unit_state': unit_state, + 'release_date': None, }) @@ -235,7 +239,6 @@ def preview_component(request, location): }) - def user_author_string(user): '''Get an author string for commits by this user. Format: first last . @@ -428,7 +431,7 @@ def delete_item(request): item = modulestore().get_item(item_location) _delete_item(item, delete_children) - + return HttpResponse() @@ -479,6 +482,34 @@ def save_item(request): return HttpResponse() +@login_required +@expect_json +def create_draft(request): + location = request.POST['id'] + + # check permissions for this user within this course + if not has_access(request.user, location): + raise PermissionDenied() + + # This clones the existing item location to a draft location (the draft is implicit, + # because modulestore is a Draft modulestore) + modulestore().clone_item(location, location) + + return HttpResponse() + +@login_required +@expect_json +def publish_draft(request): + location = request.POST['id'] + + # check permissions for this user within this course + if not has_access(request.user, location): + raise PermissionDenied() + + modulestore().publish(location) + + return HttpResponse() + @login_required @expect_json def clone_item(request): diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee index 2326756dc8..85c099ab9a 100644 --- a/cms/static/coffee/src/views/module_edit.coffee +++ b/cms/static/coffee/src/views/module_edit.coffee @@ -35,9 +35,9 @@ class CMS.Views.ModuleEdit extends Backbone.View return _metadata - cloneTemplate: (template) -> + cloneTemplate: (parent, template) -> $.post("/clone_item", { - parent_location: @$el.parent().data('id') + parent_location: parent template: template }, (data) => @model.set(id: data.id) diff --git a/cms/static/coffee/src/views/unit.coffee b/cms/static/coffee/src/views/unit.coffee index 1180b17471..3953e5ab92 100644 --- a/cms/static/coffee/src/views/unit.coffee +++ b/cms/static/coffee/src/views/unit.coffee @@ -5,7 +5,10 @@ class CMS.Views.UnitEdit extends Backbone.View 'click .new-component-templates .new-component-template a': 'saveNewComponent' 'click .new-component-templates .cancel-button': 'closeNewComponent' 'click .new-component-button': 'showNewComponentForm' - 'click .unit-actions .save-button': 'save' + 'click #save-draft': 'saveDraft' + 'click #delete-draft': 'deleteDraft' + 'click #create-draft': 'createDraft' + 'click #publish-draft': 'publishDraft' initialize: => @$newComponentItem = @$('.new-component-item') @@ -15,7 +18,6 @@ class CMS.Views.UnitEdit extends Backbone.View @$('.components').sortable( handle: '.drag-handle' - update: (event, ui) => @saveOrder() ) @$('.component').each((idx, element) => @@ -30,6 +32,7 @@ class CMS.Views.UnitEdit extends Backbone.View @model.components = @components() + # New component creation showNewComponentForm: (event) => event.preventDefault() @$newComponentItem.addClass('adding') @@ -61,13 +64,16 @@ class CMS.Views.UnitEdit extends Backbone.View @$newComponentItem.before(editor.$el) - editor.cloneTemplate($(event.currentTarget).data('location')) + editor.cloneTemplate( + @$el.data('id'), + $(event.currentTarget).data('location') + ) @closeNewComponent(event) components: => @$('.component').map((idx, el) -> $(el).data('id')).get() - saveOrder: => + saveDraft: => @model.save( children: @components() ) @@ -81,3 +87,24 @@ class CMS.Views.UnitEdit extends Backbone.View @saveOrder() ) + deleteDraft: (event) -> + $.post('/delete_item', { + id: @$el.data('id') + delete_children: true + }, => + window.location.reload() + ) + + createDraft: (event) -> + $.post('/create_draft', { + id: @$el.data('id') + }, => + @$el.toggleClass('edit-state-public edit-state-draft') + ) + + publishDraft: (event) -> + $.post('/publish_draft', { + id: @$el.data('id') + }, => + @$el.toggleClass('edit-state-public edit-state-draft') + ) \ No newline at end of file diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss index 7ed7e3ee7e..a030168cff 100644 --- a/cms/static/sass/_unit.scss +++ b/cms/static/sass/_unit.scss @@ -394,3 +394,36 @@ } } } + +.edit-state-draft { + .visibility { + display: none; + } + + #create-draft { + display: none; + } +} + +.edit-state-public { + #save-draft, + #delete-draft, + #publish-draft, + .component-actions, + .new-component-item { + display: none; + } + + .drag-handle { + display: none !important; + } +} + +.edit-state-private { + #save-draft, + #delete-draft, + #publish-draft, + #create-draft, { + display: none; + } +} diff --git a/cms/templates/unit.html b/cms/templates/unit.html index 5434c11845..581ec0bef3 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -14,12 +14,12 @@ <%block name="content"> -
+

-
    +
      % for id in components:
    1. % endfor @@ -64,14 +64,6 @@

      Unit Properties

      -
      - - Set a due date -
      -

      - Remove due date -

      -
      + This unit has been published. Click here to edit it. + This unit has already been published. Click here to release your changes to it
      -

      This unit is scheduled to be released to students on 10/12/2012 with the subsection "Administrivia and Circuit Elements."

      +

      This unit is scheduled to be released to students on ${release_date} with the subsection ""

      - Save + Save Draft + Delete Draft Preview
      @@ -114,4 +109,4 @@
- \ No newline at end of file + diff --git a/cms/urls.py b/cms/urls.py index 890e9e2671..fa5377c277 100644 --- a/cms/urls.py +++ b/cms/urls.py @@ -15,6 +15,8 @@ urlpatterns = ('', url(r'^save_item$', 'contentstore.views.save_item', name='save_item'), url(r'^delete_item$', 'contentstore.views.delete_item', name='delete_item'), url(r'^clone_item$', 'contentstore.views.clone_item', name='clone_item'), + url(r'^create_draft$', 'contentstore.views.create_draft', name='create_draft'), + url(r'^publish_draft$', 'contentstore.views.publish_draft', name='publish_draft'), url(r'^(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)$', 'contentstore.views.course_index', name='course_index'), url(r'^github_service_hook$', 'github_sync.views.github_post_receive'), diff --git a/common/lib/xmodule/xmodule/modulestore/draft.py b/common/lib/xmodule/xmodule/modulestore/draft.py index 12173ad13d..2b94f892a4 100644 --- a/common/lib/xmodule/xmodule/modulestore/draft.py +++ b/common/lib/xmodule/xmodule/modulestore/draft.py @@ -136,10 +136,12 @@ class DraftModuleStore(ModuleStoreBase): """ return super(DraftModuleStore, self).delete_item(Location(location)._replace(revision=DRAFT)) - def get_parent_locations(self, location): - '''Find all locations that are the parents of this location. Needed - for path_to_location(). - - returns an iterable of things that can be passed to Location. - ''' - return super(DraftModuleStore, self).get_parent_locations(Location(location)._replace(revision=DRAFT)) + def publish(self, location): + """ + Save a current draft to the underlying modulestore + """ + draft = self.get_item(location) + super(DraftModuleStore, self).update_item(location, draft.definition.get('data', {})) + super(DraftModuleStore, self).update_children(location, draft.definition.get('children', [])) + super(DraftModuleStore, self).update_metadata(location, draft.metadata) + self.delete_item(location) diff --git a/lms/envs/cms/dev.py b/lms/envs/cms/dev.py index 6e4697cccb..b192f12c93 100644 --- a/lms/envs/cms/dev.py +++ b/lms/envs/cms/dev.py @@ -4,16 +4,22 @@ Settings for the LMS that runs alongside the CMS on AWS from ..dev import * +modulestore_options = { + 'default_class': 'xmodule.raw_module.RawDescriptor', + 'host': 'localhost', + 'db': 'xmodule', + 'collection': 'modulestore', + 'fs_root': DATA_DIR, + 'render_template': 'mitxmako.shortcuts.render_to_string', +} + MODULESTORE = { 'default': { + 'ENGINE': 'xmodule.modulestore.mongo.DraftMongoModuleStore', + 'OPTIONS': modulestore_options + }, + 'direct': { 'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore', - 'OPTIONS': { - 'default_class': 'xmodule.raw_module.RawDescriptor', - 'host': 'localhost', - 'db': 'xmodule', - 'collection': 'modulestore', - 'fs_root': DATA_DIR, - 'render_template': 'mitxmako.shortcuts.render_to_string', - } + 'OPTIONS': modulestore_options } } From 1328fc5ac0ceeb124e27d36afbe26e0760b07a46 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Thu, 4 Oct 2012 15:27:02 -0400 Subject: [PATCH 04/29] Store published date in module metadata, and display it on draft pages --- cms/djangoapps/contentstore/utils.py | 6 ++-- cms/djangoapps/contentstore/views.py | 28 +++++++++++++------ cms/static/sass/_unit.scss | 6 ++-- cms/templates/unit.html | 16 ++++++++--- .../lib/xmodule/xmodule/modulestore/draft.py | 6 +++- 5 files changed, 43 insertions(+), 19 deletions(-) diff --git a/cms/djangoapps/contentstore/utils.py b/cms/djangoapps/contentstore/utils.py index f103c74a8d..687df11f62 100644 --- a/cms/djangoapps/contentstore/utils.py +++ b/cms/djangoapps/contentstore/utils.py @@ -35,13 +35,13 @@ def get_course_location_for_item(location): return location -def get_lms_link_for_item(item): +def get_lms_link_for_item(location): if settings.LMS_BASE is not None: lms_link = "{lms_base}/courses/{course_id}/jump_to/{location}".format( lms_base=settings.LMS_BASE, # TODO: These will need to be changed to point to the particular instance of this problem in the particular course - course_id = modulestore().get_containing_courses(item.location)[0].id, - location=item.location, + course_id = modulestore().get_containing_courses(location)[0].id, + location=location, ) else: lms_link = None diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py index cf60de7937..43ec799a66 100644 --- a/cms/djangoapps/contentstore/views.py +++ b/cms/djangoapps/contentstore/views.py @@ -1,11 +1,12 @@ from util.json_request import expect_json -import json -import os -import logging -import sys -import mimetypes -import StringIO import exceptions +import json +import logging +import mimetypes +import os +import StringIO +import sys +import time from collections import defaultdict from uuid import uuid4 @@ -154,7 +155,7 @@ def edit_subsection(request, location): item = modulestore().get_item(location) - lms_link = get_lms_link_for_item(item) + lms_link = get_lms_link_for_item(location) # make sure that location references a 'sequential', otherwise return BadRequest if item.location.category != 'sequential': @@ -183,7 +184,8 @@ def edit_unit(request, location): item = modulestore().get_item(location) - lms_link = get_lms_link_for_item(item) + # The non-draft location + lms_link = get_lms_link_for_item(item.location._replace(revision=None)) component_templates = defaultdict(list) @@ -212,16 +214,24 @@ def edit_unit(request, location): unit_state = compute_unit_state(item) + try: + published_date = time.strftime('%B %d, %Y', item.metadata.get('published_date')) + except TypeError: + published_date = None + return render_to_response('unit.html', { 'unit': item, + 'unit_location': published_location, 'components': components, 'component_templates': component_templates, - 'lms_link': lms_link, + 'draft_preview_link': lms_link, + 'published_preview_link': lms_link, 'subsection': containing_subsection, 'section': containing_section, 'create_new_unit_template': Location('i4x', 'edx', 'templates', 'vertical', 'Empty'), 'unit_state': unit_state, 'release_date': None, + 'published_date': published_date, }) diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss index a030168cff..fcd2f9a64d 100644 --- a/cms/static/sass/_unit.scss +++ b/cms/static/sass/_unit.scss @@ -87,7 +87,7 @@ } } - .rendered-component { + .xmodule_display { padding: 40px 20px 20px; } @@ -410,7 +410,8 @@ #delete-draft, #publish-draft, .component-actions, - .new-component-item { + .new-component-item, + #published-alert { display: none; } @@ -423,6 +424,7 @@ #save-draft, #delete-draft, #publish-draft, + #published-alert, #create-draft, { display: none; } diff --git a/cms/templates/unit.html b/cms/templates/unit.html index 581ec0bef3..7f300d717c 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -8,14 +8,22 @@ new CMS.Views.UnitEdit({ el: $('.main-wrapper'), model: new CMS.Models.Module({ - id: '${unit.location.url()}' + id: '${unit_location}' }) }); <%block name="content"> -
+
+
+

You are editing a draft. + % if published_date: + This unit was originally published on ${published_date}. + % endif +

+ Preview the published version +

@@ -60,7 +68,7 @@
-
+

Unit Properties

@@ -79,7 +87,7 @@
Save Draft Delete Draft - Preview + Preview
diff --git a/common/lib/xmodule/xmodule/modulestore/draft.py b/common/lib/xmodule/xmodule/modulestore/draft.py index 2b94f892a4..da46e94bce 100644 --- a/common/lib/xmodule/xmodule/modulestore/draft.py +++ b/common/lib/xmodule/xmodule/modulestore/draft.py @@ -1,3 +1,4 @@ +from datetime import datetime from . import ModuleStoreBase, Location from .exceptions import ItemNotFoundError @@ -141,7 +142,10 @@ class DraftModuleStore(ModuleStoreBase): Save a current draft to the underlying modulestore """ draft = self.get_item(location) + metadata = {} + metadata.update(draft.metadata) + metadata['published_date'] = tuple(datetime.utcnow().timetuple()) super(DraftModuleStore, self).update_item(location, draft.definition.get('data', {})) super(DraftModuleStore, self).update_children(location, draft.definition.get('children', [])) - super(DraftModuleStore, self).update_metadata(location, draft.metadata) + super(DraftModuleStore, self).update_metadata(location, metadata) self.delete_item(location) From b6c93b61fd5fd7d4a5206be0d45402f26007b4a8 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Thu, 4 Oct 2012 15:27:52 -0400 Subject: [PATCH 05/29] Mark published_date as system metadata --- common/lib/xmodule/xmodule/x_module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py index fd209ee26f..b0ea7772fb 100644 --- a/common/lib/xmodule/xmodule/x_module.py +++ b/common/lib/xmodule/xmodule/x_module.py @@ -409,7 +409,7 @@ class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates): # cdodge: this is a list of metadata names which are 'system' metadata # and should not be edited by an end-user - system_metadata_fields = [ 'data_dir' ] + system_metadata_fields = ['data_dir', 'published_date'] # A list of descriptor attributes that must be equal for the descriptors to # be equal From 1585286c556933f70b545948d8b032dd2e3c78ac Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 5 Oct 2012 09:37:14 -0400 Subject: [PATCH 06/29] Pass onDelete to newly created ModuleEdit views --- cms/static/coffee/src/views/unit.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/cms/static/coffee/src/views/unit.coffee b/cms/static/coffee/src/views/unit.coffee index 3953e5ab92..973bf5d0f5 100644 --- a/cms/static/coffee/src/views/unit.coffee +++ b/cms/static/coffee/src/views/unit.coffee @@ -59,6 +59,7 @@ class CMS.Views.UnitEdit extends Backbone.View event.preventDefault() editor = new CMS.Views.ModuleEdit( + onDelete: @deleteComponent model: new CMS.Models.Module() ) From 05c02f0d5f8efce60d23baa20a06099b5f59dfca Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 5 Oct 2012 10:28:18 -0400 Subject: [PATCH 07/29] Fixing tests from changes around draft mode --- cms/djangoapps/contentstore/tests/tests.py | 16 +++++----- cms/djangoapps/contentstore/views.py | 1 + cms/envs/test.py | 22 ++++++++----- .../xmodule/xmodule/modulestore/__init__.py | 8 +++-- .../lib/xmodule/xmodule/modulestore/mongo.py | 31 ++++++++++++------- .../lib/xmodule/xmodule/modulestore/search.py | 9 +++--- common/lib/xmodule/xmodule/modulestore/xml.py | 15 +++++---- 7 files changed, 59 insertions(+), 43 deletions(-) diff --git a/cms/djangoapps/contentstore/tests/tests.py b/cms/djangoapps/contentstore/tests/tests.py index 429774c91e..a149ce65b2 100644 --- a/cms/djangoapps/contentstore/tests/tests.py +++ b/cms/djangoapps/contentstore/tests/tests.py @@ -141,8 +141,6 @@ class AuthTestCase(ContentStoreTestCase): """Make sure pages that do require login work.""" auth_pages = ( reverse('index'), - reverse('edit_item'), - reverse('save_item'), ) # These are pages that should just load when the user is logged in @@ -195,17 +193,17 @@ class EditTestCase(ContentStoreTestCase): xmodule.modulestore.django._MODULESTORES = {} xmodule.modulestore.django.modulestore().collection.drop() - def check_edit_item(self, test_course_name): + def check_edit_unit(self, test_course_name): import_from_xml(modulestore(), 'common/test/data/', [test_course_name]) - for descriptor in modulestore().get_items(Location(None, None, None, None, None)): + for descriptor in modulestore().get_items(Location(None, None, 'vertical', None, None)): print "Checking ", descriptor.location.url() print descriptor.__class__, descriptor.location - resp = self.client.get(reverse('edit_item'), {'id': descriptor.location.url()}) + resp = self.client.get(reverse('edit_unit', kwargs={'location': descriptor.location.url()})) self.assertEqual(resp.status_code, 200) - def test_edit_item_toy(self): - self.check_edit_item('toy') + def test_edit_unit_toy(self): + self.check_edit_unit('toy') - def test_edit_item_full(self): - self.check_edit_item('full') + def test_edit_unit_full(self): + self.check_edit_unit('full') diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py index 43ec799a66..94dcc58b3c 100644 --- a/cms/djangoapps/contentstore/views.py +++ b/cms/djangoapps/contentstore/views.py @@ -169,6 +169,7 @@ def edit_subsection(request, location): 'lms_link': lms_link }) + @login_required def edit_unit(request, location): """ diff --git a/cms/envs/test.py b/cms/envs/test.py index 7dcd32caab..217ed0e573 100644 --- a/cms/envs/test.py +++ b/cms/envs/test.py @@ -38,17 +38,23 @@ STATICFILES_DIRS += [ if os.path.isdir(COMMON_TEST_DATA_ROOT / course_dir) ] +modulestore_options = { + 'default_class': 'xmodule.raw_module.RawDescriptor', + 'host': 'localhost', + 'db': 'test_xmodule', + 'collection': 'modulestore', + 'fs_root': GITHUB_REPO_ROOT, + 'render_template': 'mitxmako.shortcuts.render_to_string', +} + MODULESTORE = { 'default': { 'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore', - 'OPTIONS': { - 'default_class': 'xmodule.raw_module.RawDescriptor', - 'host': 'localhost', - 'db': 'test_xmodule', - 'collection': 'modulestore', - 'fs_root': GITHUB_REPO_ROOT, - 'render_template': 'mitxmako.shortcuts.render_to_string', - } + 'OPTIONS': modulestore_options + }, + 'direct': { + 'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore', + 'OPTIONS': modulestore_options } } diff --git a/common/lib/xmodule/xmodule/modulestore/__init__.py b/common/lib/xmodule/xmodule/modulestore/__init__.py index 3ee83449f9..3e22f2f506 100644 --- a/common/lib/xmodule/xmodule/modulestore/__init__.py +++ b/common/lib/xmodule/xmodule/modulestore/__init__.py @@ -240,11 +240,15 @@ class ModuleStore(object): An abstract interface for a database backend that stores XModuleDescriptor instances """ + def has_item(self, location): + """ + Returns True if location exists in this ModuleStore. + """ + raise NotImplementedError + def get_item(self, location, depth=0): """ Returns an XModuleDescriptor instance for the item at location. - If location.revision is None, returns the item with the most - recent revision If any segment of the location is None except revision, raises xmodule.modulestore.exceptions.InsufficientSpecificationError diff --git a/common/lib/xmodule/xmodule/modulestore/mongo.py b/common/lib/xmodule/xmodule/modulestore/mongo.py index 1e203c6a78..30ae5c7539 100644 --- a/common/lib/xmodule/xmodule/modulestore/mongo.py +++ b/common/lib/xmodule/xmodule/modulestore/mongo.py @@ -70,17 +70,21 @@ class CachingDescriptorSystem(MakoDescriptorSystem): ) -def location_to_query(location): +def location_to_query(location, wildcard=True): """ Takes a Location and returns a SON object that will query for that location. Fields in location that are None are ignored in the query + + If `wildcard` is True, then a None in a location is treated as a wildcard + query. Otherwise, it is searched for literally """ query = SON() # Location dict is ordered by specificity, and SON # will preserve that order for queries for key, val in Location(location).dict().iteritems(): - if val is not None: - query['_id.{key}'.format(key=key)] = val + if wildcard and val is None: + continue + query['_id.{key}'.format(key=key)] = val return query @@ -203,18 +207,27 @@ class MongoModuleStore(ModuleStoreBase): ItemNotFoundError. ''' item = self.collection.find_one( - location_to_query(location), + location_to_query(location, wildcard=False), sort=[('revision', pymongo.ASCENDING)], ) if item is None: raise ItemNotFoundError(location) return item + def has_item(self, location): + """ + Returns True if location exists in this ModuleStore. + """ + location = Location.ensure_fully_specified(location) + try: + self._find_one(location) + return True + except ItemNotFoundError: + return False + def get_item(self, location, depth=0): """ Returns an XModuleDescriptor instance for the item at location. - If location.revision is None, returns the item with the most - recent revision. If any segment of the location is None except revision, raises xmodule.modulestore.exceptions.InsufficientSpecificationError @@ -322,16 +335,10 @@ class MongoModuleStore(ModuleStoreBase): '''Find all locations that are the parents of this location. Needed for path_to_location(). - If there is no data at location in this modulestore, raise - ItemNotFoundError. - returns an iterable of things that can be passed to Location. This may be empty if there are no parents. ''' location = Location.ensure_fully_specified(location) - # Check that it's actually in this modulestore. - self._find_one(location) - # now get the parents items = self.collection.find({'definition.children': location.url()}, {'_id': True}) return [i['_id'] for i in items] diff --git a/common/lib/xmodule/xmodule/modulestore/search.py b/common/lib/xmodule/xmodule/modulestore/search.py index f9901e8bfe..e6d71d271e 100644 --- a/common/lib/xmodule/xmodule/modulestore/search.py +++ b/common/lib/xmodule/xmodule/modulestore/search.py @@ -60,10 +60,8 @@ def path_to_location(modulestore, course_id, location): (loc, path) = queue.pop() # Takes from the end loc = Location(loc) - # get_parent_locations should raise ItemNotFoundError if location - # isn't found so we don't have to do it explicitly. Call this - # first to make sure the location is there (even if it's a course, and - # we would otherwise immediately exit). + # Call get_parent_locations first to make sure the location is there + # (even if it's a course, and we would otherwise immediately exit). parents = modulestore.get_parent_locations(loc) # print 'Processing loc={0}, path={1}'.format(loc, path) @@ -81,6 +79,9 @@ def path_to_location(modulestore, course_id, location): # If we're here, there is no path return None + if not modulestore.has_item(location): + raise ItemNotFoundError + path = find_path_to_course() if path is None: raise NoPathToItem(location) diff --git a/common/lib/xmodule/xmodule/modulestore/xml.py b/common/lib/xmodule/xmodule/modulestore/xml.py index 6f8430917d..baef017665 100644 --- a/common/lib/xmodule/xmodule/modulestore/xml.py +++ b/common/lib/xmodule/xmodule/modulestore/xml.py @@ -477,11 +477,16 @@ class XMLModuleStore(ModuleStoreBase): except KeyError: raise ItemNotFoundError(location) + def has_item(self, location): + """ + Returns True if location exists in this ModuleStore. + """ + location = Location(location) + return any(location in course_modules for course_modules in self.modules.values()) + def get_item(self, location, depth=0): """ Returns an XModuleDescriptor instance for the item at location. - If location.revision is None, returns the most item with the most - recent revision If any segment of the location is None except revision, raises xmodule.modulestore.exceptions.InsufficientSpecificationError @@ -545,14 +550,8 @@ class XMLModuleStore(ModuleStoreBase): '''Find all locations that are the parents of this location. Needed for path_to_location(). - If there is no data at location in this modulestore, raise - ItemNotFoundError. - returns an iterable of things that can be passed to Location. This may be empty if there are no parents. ''' location = Location.ensure_fully_specified(location) - if not self.parent_tracker.is_known(location): - raise ItemNotFoundError(location) - return self.parent_tracker.parents(location) From 2b030f7aaf5bbfeb35e62b72b55d7147c3633191 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 5 Oct 2012 10:43:51 -0400 Subject: [PATCH 08/29] Clean up how tests use modulestores --- cms/djangoapps/contentstore/tests/tests.py | 1 + lms/djangoapps/courseware/tests/tests.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cms/djangoapps/contentstore/tests/tests.py b/cms/djangoapps/contentstore/tests/tests.py index a149ce65b2..b5dfc3c4fe 100644 --- a/cms/djangoapps/contentstore/tests/tests.py +++ b/cms/djangoapps/contentstore/tests/tests.py @@ -179,6 +179,7 @@ class AuthTestCase(ContentStoreTestCase): TEST_DATA_MODULESTORE = copy.deepcopy(settings.MODULESTORE) TEST_DATA_MODULESTORE['default']['OPTIONS']['fs_root'] = path('common/test/data') +TEST_DATA_MODULESTORE['direct']['OPTIONS']['fs_root'] = path('common/test/data') @override_settings(MODULESTORE=TEST_DATA_MODULESTORE) class EditTestCase(ContentStoreTestCase): diff --git a/lms/djangoapps/courseware/tests/tests.py b/lms/djangoapps/courseware/tests/tests.py index 678eb1ccf0..3de344b156 100644 --- a/lms/djangoapps/courseware/tests/tests.py +++ b/lms/djangoapps/courseware/tests/tests.py @@ -57,7 +57,7 @@ def mongo_store_config(data_dir): 'OPTIONS': { 'default_class': 'xmodule.raw_module.RawDescriptor', 'host': 'localhost', - 'db': 'xmodule', + 'db': 'test_xmodule', 'collection': 'modulestore', 'fs_root': data_dir, 'render_template': 'mitxmako.shortcuts.render_to_string', From 310f26a6de515391b2f29ed25b887962a08997f9 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 5 Oct 2012 11:19:35 -0400 Subject: [PATCH 09/29] Basic implementation of draft, public and private modes --- cms/djangoapps/contentstore/utils.py | 4 +- cms/djangoapps/contentstore/views.py | 15 ++++++ cms/static/coffee/src/views/unit.coffee | 40 +++++++++++--- cms/static/sass/_unit.scss | 1 - cms/templates/unit.html | 9 ++-- cms/urls.py | 7 ++- .../lib/xmodule/xmodule/modulestore/draft.py | 53 ++++++++++++++----- 7 files changed, 100 insertions(+), 29 deletions(-) diff --git a/cms/djangoapps/contentstore/utils.py b/cms/djangoapps/contentstore/utils.py index 687df11f62..e138a9327e 100644 --- a/cms/djangoapps/contentstore/utils.py +++ b/cms/djangoapps/contentstore/utils.py @@ -59,9 +59,9 @@ def compute_unit_state(unit): 'private' content is editabled and not visible in the LMS """ - if unit.location.revision == DRAFT: + if unit.metadata.get('is_draft', False): try: - modulestore('direct').get_item(unit.location._replace(revision=None)) + modulestore('direct').get_item(unit.location) return 'draft' except ItemNotFoundError: return 'private' diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py index 94dcc58b3c..3944fc1e4f 100644 --- a/cms/djangoapps/contentstore/views.py +++ b/cms/djangoapps/contentstore/views.py @@ -521,6 +521,21 @@ def publish_draft(request): return HttpResponse() + +@login_required +@expect_json +def unpublish_unit(request): + location = request.POST['id'] + + # check permissions for this user within this course + if not has_access(request.user, location): + raise PermissionDenied() + + modulestore().unpublish(location) + + return HttpResponse() + + @login_required @expect_json def clone_item(request): diff --git a/cms/static/coffee/src/views/unit.coffee b/cms/static/coffee/src/views/unit.coffee index 973bf5d0f5..bf5cd32856 100644 --- a/cms/static/coffee/src/views/unit.coffee +++ b/cms/static/coffee/src/views/unit.coffee @@ -9,8 +9,15 @@ class CMS.Views.UnitEdit extends Backbone.View 'click #delete-draft': 'deleteDraft' 'click #create-draft': 'createDraft' 'click #publish-draft': 'publishDraft' + 'change #visibility': 'setVisibility' initialize: => + @visibility_view = new CMS.Views.UnitEdit.Visibility( + el: @$('#visibility') + model: @model + ) + @visibility_view.render() + @$newComponentItem = @$('.new-component-item') @$newComponentTypePicker = @$('.new-component') @$newComponentTemplatePickers = @$('.new-component-templates') @@ -18,6 +25,7 @@ class CMS.Views.UnitEdit extends Backbone.View @$('.components').sortable( handle: '.drag-handle' + update: (event, ui) => @model.set('children', @components()) ) @$('.component').each((idx, element) => @@ -28,10 +36,9 @@ class CMS.Views.UnitEdit extends Backbone.View id: $(element).data('id'), ) ) + update: (event, ui) => @model.set('children', @components()) ) - @model.components = @components() - # New component creation showNewComponentForm: (event) => event.preventDefault() @@ -75,9 +82,7 @@ class CMS.Views.UnitEdit extends Backbone.View components: => @$('.component').map((idx, el) -> $(el).data('id')).get() saveDraft: => - @model.save( - children: @components() - ) + @model.save() deleteComponent: (event) => $component = $(event.currentTarget).parents('.component') @@ -101,6 +106,7 @@ class CMS.Views.UnitEdit extends Backbone.View id: @$el.data('id') }, => @$el.toggleClass('edit-state-public edit-state-draft') + @model.set('state', 'draft') ) publishDraft: (event) -> @@ -108,4 +114,26 @@ class CMS.Views.UnitEdit extends Backbone.View id: @$el.data('id') }, => @$el.toggleClass('edit-state-public edit-state-draft') - ) \ No newline at end of file + @model.set('state', 'public') + ) + + setVisibility: (event) -> + if @$('#visibility').val() == 'private' + target_url = '/unpublish_unit' + else + target_url = '/publish_draft' + + $.post(target_url, { + id: @$el.data('id') + }, => + @$el.toggleClass('edit-state-public edit-state-private') + @model.set('state', @$('#visibility').val()) + ) + +class CMS.Views.UnitEdit.Visibility extends Backbone.View + initialize: => + @model.on('change:state', @render) + + render: => + @$el.val(@model.get('state')) + diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss index fcd2f9a64d..7323f37bfd 100644 --- a/cms/static/sass/_unit.scss +++ b/cms/static/sass/_unit.scss @@ -421,7 +421,6 @@ } .edit-state-private { - #save-draft, #delete-draft, #publish-draft, #published-alert, diff --git a/cms/templates/unit.html b/cms/templates/unit.html index 7f300d717c..4b0242e886 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -8,7 +8,8 @@ new CMS.Views.UnitEdit({ el: $('.main-wrapper'), model: new CMS.Models.Module({ - id: '${unit_location}' + id: '${unit_location}', + state: '${unit_state}' }) }); @@ -74,9 +75,9 @@
- + +
This unit has been published. Click here to edit it. diff --git a/cms/urls.py b/cms/urls.py index fa5377c277..faf3a61b84 100644 --- a/cms/urls.py +++ b/cms/urls.py @@ -1,8 +1,6 @@ from django.conf import settings from django.conf.urls import patterns, include, url -import django.contrib.auth.views - # Uncomment the next two lines to enable the admin: # from django.contrib import admin # admin.autodiscover() @@ -17,12 +15,13 @@ urlpatterns = ('', url(r'^clone_item$', 'contentstore.views.clone_item', name='clone_item'), url(r'^create_draft$', 'contentstore.views.create_draft', name='create_draft'), url(r'^publish_draft$', 'contentstore.views.publish_draft', name='publish_draft'), + url(r'^unpublish_unit$', 'contentstore.views.unpublish_unit', name='unpublish_unit'), url(r'^(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)$', 'contentstore.views.course_index', name='course_index'), url(r'^github_service_hook$', 'github_sync.views.github_post_receive'), url(r'^preview/modx/(?P[^/]*)/(?P.*?)/(?P[^/]*)$', 'contentstore.views.preview_dispatch', name='preview_dispatch'), - url(r'^(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)/upload_asset$', + url(r'^(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)/upload_asset$', 'contentstore.views.upload_asset', name='upload_asset'), url(r'^manage_users/(?P.*?)$', 'contentstore.views.manage_users', name='manage_users'), url(r'^add_user/(?P.*?)$', @@ -56,6 +55,6 @@ urlpatterns += ( if settings.DEBUG: ## Jasmine - urlpatterns=urlpatterns + (url(r'^_jasmine/', include('django_jasmine.urls')),) + urlpatterns = urlpatterns + (url(r'^_jasmine/', include('django_jasmine.urls')),) urlpatterns = patterns(*urlpatterns) diff --git a/common/lib/xmodule/xmodule/modulestore/draft.py b/common/lib/xmodule/xmodule/modulestore/draft.py index da46e94bce..dae6552978 100644 --- a/common/lib/xmodule/xmodule/modulestore/draft.py +++ b/common/lib/xmodule/xmodule/modulestore/draft.py @@ -6,6 +6,24 @@ from .exceptions import ItemNotFoundError DRAFT = 'draft' +def as_draft(location): + """ + Returns the Location that is the draft for `location` + """ + return Location(location)._replace(revision=DRAFT) + + +def wrap_draft(item): + """ + Sets `item.metadata['is_draft']` to `True` if the item is a + draft, and false otherwise. Sets the item's location to the + non-draft location in either case + """ + item.metadata['is_draft'] = item.location.revision == DRAFT + item.location = item.location._replace(revision=None) + return item + + class DraftModuleStore(ModuleStoreBase): """ This mixin modifies a modulestore to give it draft semantics. @@ -37,9 +55,9 @@ class DraftModuleStore(ModuleStoreBase): get_children() to cache. None indicates to cache all descendents """ try: - return super(DraftModuleStore, self).get_item(Location(location)._replace(revision=DRAFT), depth) + return wrap_draft(super(DraftModuleStore, self).get_item(as_draft(location), depth)) except ItemNotFoundError: - return super(DraftModuleStore, self).get_item(location, depth) + return wrap_draft(super(DraftModuleStore, self).get_item(location, depth)) def get_instance(self, course_id, location): """ @@ -47,9 +65,9 @@ class DraftModuleStore(ModuleStoreBase): TODO (vshnayder): this may want to live outside the modulestore eventually """ try: - return super(DraftModuleStore, self).get_instance(course_id, Location(location)._replace(revision=DRAFT)) + return wrap_draft(super(DraftModuleStore, self).get_instance(course_id, as_draft(location))) except ItemNotFoundError: - return super(DraftModuleStore, self).get_instance(course_id, location) + return wrap_draft(super(DraftModuleStore, self).get_instance(course_id, location)) def get_items(self, location, depth=0): """ @@ -64,7 +82,7 @@ class DraftModuleStore(ModuleStoreBase): in the request. The depth is counted in the number of calls to get_children() to cache. None indicates to cache all descendents """ - draft_loc = Location(location)._replace(revision=DRAFT) + draft_loc = as_draft(location) draft_items = super(DraftModuleStore, self).get_items(draft_loc, depth) items = super(DraftModuleStore, self).get_items(location, depth) @@ -75,14 +93,14 @@ class DraftModuleStore(ModuleStoreBase): if (item.location.revision != DRAFT and item.location._replace(revision=None) not in draft_locs_found) ] - return draft_items + non_draft_items + return [wrap_draft(item) for item in draft_items + non_draft_items] def clone_item(self, source, location): """ Clone a new item that is a copy of the item at the location `source` and writes it to `location` """ - return super(DraftModuleStore, self).clone_item(source, Location(location)._replace(revision=DRAFT)) + return super(DraftModuleStore, self).clone_item(source, as_draft(location)) def update_item(self, location, data): """ @@ -92,7 +110,7 @@ class DraftModuleStore(ModuleStoreBase): location: Something that can be passed to Location data: A nested dictionary of problem data """ - draft_loc = Location(location)._replace(revision=DRAFT) + draft_loc = as_draft(location) draft_item = self.get_item(location) if draft_item.location.revision != DRAFT: self.clone_item(location, draft_loc) @@ -107,9 +125,9 @@ class DraftModuleStore(ModuleStoreBase): location: Something that can be passed to Location children: A list of child item identifiers """ - draft_loc = Location(location)._replace(revision=DRAFT) + draft_loc = as_draft(location) draft_item = self.get_item(location) - if draft_item.location.revision != DRAFT: + if not draft_item.metadata['is_draft']: self.clone_item(location, draft_loc) return super(DraftModuleStore, self).update_children(draft_loc, children) @@ -122,8 +140,12 @@ class DraftModuleStore(ModuleStoreBase): location: Something that can be passed to Location metadata: A nested dictionary of module metadata """ - draft_loc = Location(location)._replace(revision=DRAFT) + draft_loc = as_draft(location) draft_item = self.get_item(location) + + if 'is_draft' in metadata: + del metadata['is_draft'] + if draft_item.location.revision != DRAFT: self.clone_item(location, draft_loc) @@ -135,7 +157,7 @@ class DraftModuleStore(ModuleStoreBase): location: Something that can be passed to Location """ - return super(DraftModuleStore, self).delete_item(Location(location)._replace(revision=DRAFT)) + return super(DraftModuleStore, self).delete_item(as_draft(location)) def publish(self, location): """ @@ -149,3 +171,10 @@ class DraftModuleStore(ModuleStoreBase): super(DraftModuleStore, self).update_children(location, draft.definition.get('children', [])) super(DraftModuleStore, self).update_metadata(location, metadata) self.delete_item(location) + + def unpublish(self, location): + """ + Turn the published version into a draft, removing the published version + """ + super(DraftModuleStore, self).clone_item(location, as_draft(location)) + super(DraftModuleStore, self).delete_item(location) From b079b336db8a19419d654c8e920e00d300aebaf1 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 5 Oct 2012 11:22:31 -0400 Subject: [PATCH 10/29] Make updating children and data of a draft make the correct checks for whether the document is already a draft or not --- common/lib/xmodule/xmodule/modulestore/draft.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/lib/xmodule/xmodule/modulestore/draft.py b/common/lib/xmodule/xmodule/modulestore/draft.py index dae6552978..671a710836 100644 --- a/common/lib/xmodule/xmodule/modulestore/draft.py +++ b/common/lib/xmodule/xmodule/modulestore/draft.py @@ -112,7 +112,7 @@ class DraftModuleStore(ModuleStoreBase): """ draft_loc = as_draft(location) draft_item = self.get_item(location) - if draft_item.location.revision != DRAFT: + if not draft_item.metadata['is_draft']: self.clone_item(location, draft_loc) return super(DraftModuleStore, self).update_item(draft_loc, data) @@ -143,12 +143,12 @@ class DraftModuleStore(ModuleStoreBase): draft_loc = as_draft(location) draft_item = self.get_item(location) + if not draft_item.metadata['is_draft']: + self.clone_item(location, draft_loc) + if 'is_draft' in metadata: del metadata['is_draft'] - if draft_item.location.revision != DRAFT: - self.clone_item(location, draft_loc) - return super(DraftModuleStore, self).update_metadata(draft_loc, metadata) def delete_item(self, location): From e99aa117d778c28d02cea00d44b1e516c77f7afa Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 5 Oct 2012 11:51:00 -0400 Subject: [PATCH 11/29] Make publish and unpublish recursive operations --- cms/djangoapps/contentstore/views.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py index 3944fc1e4f..ce66b55d5f 100644 --- a/cms/djangoapps/contentstore/views.py +++ b/cms/djangoapps/contentstore/views.py @@ -418,6 +418,13 @@ def get_module_previews(request, descriptor): preview_html.append(module.get_html()) return preview_html + +def _xmodule_recurse(item, action): + for child in item.get_children(): + _xmodule_recurse(child, action) + + action(item) + def _delete_item(item, recurse=False): if recurse: children = item.get_children() @@ -441,7 +448,10 @@ def delete_item(request): item = modulestore().get_item(item_location) - _delete_item(item, delete_children) + if delete_children: + _xmodule_recurse(item, lambda i: modulestore().delete_item(i.location)) + else: + modulestore().delete_item(item.location) return HttpResponse() @@ -517,7 +527,8 @@ def publish_draft(request): if not has_access(request.user, location): raise PermissionDenied() - modulestore().publish(location) + item = modulestore().get_item(location) + _xmodule_recurse(item, lambda i: modulestore().publish(i.location)) return HttpResponse() @@ -531,7 +542,8 @@ def unpublish_unit(request): if not has_access(request.user, location): raise PermissionDenied() - modulestore().unpublish(location) + item = modulestore().get_item(location) + _xmodule_recurse(item, lambda i: modulestore().unpublish(i.location)) return HttpResponse() From 5dcf388b1c10029c4ecabfb08b86aa322ee0cbca Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 5 Oct 2012 12:11:26 -0400 Subject: [PATCH 12/29] Add line numbers and wrapping to xml, json, and html editors --- common/lib/xmodule/xmodule/js/src/html/edit.coffee | 2 ++ common/lib/xmodule/xmodule/js/src/raw/edit/json.coffee | 2 ++ common/lib/xmodule/xmodule/js/src/raw/edit/xml.coffee | 2 ++ 3 files changed, 6 insertions(+) diff --git a/common/lib/xmodule/xmodule/js/src/html/edit.coffee b/common/lib/xmodule/xmodule/js/src/html/edit.coffee index b7699953e6..e678a9b2eb 100644 --- a/common/lib/xmodule/xmodule/js/src/html/edit.coffee +++ b/common/lib/xmodule/xmodule/js/src/html/edit.coffee @@ -2,6 +2,8 @@ class @HTMLEditingDescriptor constructor: (@element) -> @edit_box = CodeMirror.fromTextArea($(".edit-box", @element)[0], { mode: "text/html" + lineNumbers: true + lineWrapping: true }) save: -> diff --git a/common/lib/xmodule/xmodule/js/src/raw/edit/json.coffee b/common/lib/xmodule/xmodule/js/src/raw/edit/json.coffee index b795970b73..7c3c09cefc 100644 --- a/common/lib/xmodule/xmodule/js/src/raw/edit/json.coffee +++ b/common/lib/xmodule/xmodule/js/src/raw/edit/json.coffee @@ -2,6 +2,8 @@ class @JSONEditingDescriptor extends XModule.Descriptor constructor: (@element) -> @edit_box = CodeMirror.fromTextArea($(".edit-box", @element)[0], { mode: { name: "javascript", json: true } + lineNumbers: true + lineWrapping: true }) save: -> diff --git a/common/lib/xmodule/xmodule/js/src/raw/edit/xml.coffee b/common/lib/xmodule/xmodule/js/src/raw/edit/xml.coffee index 47c993e78d..68981e465b 100644 --- a/common/lib/xmodule/xmodule/js/src/raw/edit/xml.coffee +++ b/common/lib/xmodule/xmodule/js/src/raw/edit/xml.coffee @@ -2,6 +2,8 @@ class @XMLEditingDescriptor extends XModule.Descriptor constructor: (@element) -> @edit_box = CodeMirror.fromTextArea($(".edit-box", @element)[0], { mode: "xml" + lineNumbers: true + lineWrapping: true }) save: -> From 9d6a7ffed1d2b20f14d33a3e5e041058ab490d29 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 5 Oct 2012 12:55:15 -0400 Subject: [PATCH 13/29] Link release dates message to correct subsection edit page --- cms/djangoapps/contentstore/views.py | 1 - cms/templates/unit.html | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py index ce66b55d5f..b4889b0621 100644 --- a/cms/djangoapps/contentstore/views.py +++ b/cms/djangoapps/contentstore/views.py @@ -231,7 +231,6 @@ def edit_unit(request, location): 'section': containing_section, 'create_new_unit_template': Location('i4x', 'edx', 'templates', 'vertical', 'Empty'), 'unit_state': unit_state, - 'release_date': None, 'published_date': published_date, }) diff --git a/cms/templates/unit.html b/cms/templates/unit.html index 4b0242e886..bef3695a8d 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -83,7 +83,7 @@ This unit has been published. Click here to edit it. This unit has already been published. Click here to release your changes to it
-

This unit is scheduled to be released to students on ${release_date} with the subsection ""

+

This unit is scheduled to be released to students on ${subsection.start} with the subsection "${subsection.display_name}"

Save Draft From 7ccdc5d42aad6411d6d5eabb59f0198f4ed3c6e6 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 5 Oct 2012 13:23:23 -0400 Subject: [PATCH 14/29] Grey out inactive items when changing state in unit editing view --- cms/static/coffee/src/views/unit.coffee | 21 ++++++++++++++++++--- cms/static/sass/_base.scss | 4 ++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/cms/static/coffee/src/views/unit.coffee b/cms/static/coffee/src/views/unit.coffee index bf5cd32856..e00c943412 100644 --- a/cms/static/coffee/src/views/unit.coffee +++ b/cms/static/coffee/src/views/unit.coffee @@ -18,6 +18,8 @@ class CMS.Views.UnitEdit extends Backbone.View ) @visibility_view.render() + @model.on('change:state', @render) + @$newComponentItem = @$('.new-component-item') @$newComponentTypePicker = @$('.new-component') @$newComponentTemplatePickers = @$('.new-component-templates') @@ -81,6 +83,14 @@ class CMS.Views.UnitEdit extends Backbone.View components: => @$('.component').map((idx, el) -> $(el).data('id')).get() + wait: (value) => + @$('.unit-body').toggleClass("waiting", value) + + render: => + if @model.hasChanged('state') + @$el.toggleClass("edit-state-#{@model.previous('state')} edit-state-#{@model.get('state')}") + @wait(false) + saveDraft: => @model.save() @@ -94,6 +104,8 @@ class CMS.Views.UnitEdit extends Backbone.View ) deleteDraft: (event) -> + @wait(true) + $.post('/delete_item', { id: @$el.data('id') delete_children: true @@ -102,18 +114,20 @@ class CMS.Views.UnitEdit extends Backbone.View ) createDraft: (event) -> + @wait(true) + $.post('/create_draft', { id: @$el.data('id') }, => - @$el.toggleClass('edit-state-public edit-state-draft') @model.set('state', 'draft') ) publishDraft: (event) -> + @wait(true) + $.post('/publish_draft', { id: @$el.data('id') }, => - @$el.toggleClass('edit-state-public edit-state-draft') @model.set('state', 'public') ) @@ -123,10 +137,11 @@ class CMS.Views.UnitEdit extends Backbone.View else target_url = '/publish_draft' + @wait(true) + $.post(target_url, { id: @$el.data('id') }, => - @$el.toggleClass('edit-state-public edit-state-private') @model.set('state', @$('#visibility').val()) ) diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index fe97c9b975..e57c8338d5 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -29,6 +29,10 @@ h1 { margin: 36px 6px; } +.waiting { + opacity: 0.1; +} + .page-actions { float: right; margin-top: 42px; From 28ea66285580239a879f57e03992082afa2b4c73 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 5 Oct 2012 13:25:55 -0400 Subject: [PATCH 15/29] Save a draft before publishing it --- cms/static/coffee/src/views/unit.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cms/static/coffee/src/views/unit.coffee b/cms/static/coffee/src/views/unit.coffee index e00c943412..a4ec53f68e 100644 --- a/cms/static/coffee/src/views/unit.coffee +++ b/cms/static/coffee/src/views/unit.coffee @@ -124,7 +124,8 @@ class CMS.Views.UnitEdit extends Backbone.View publishDraft: (event) -> @wait(true) - + @saveDraft() + $.post('/publish_draft', { id: @$el.data('id') }, => From bfb5f333a94db52bc185c856ea2074718ea94d4c Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 5 Oct 2012 14:02:31 -0400 Subject: [PATCH 16/29] Disable save draft button when there is nothing to save --- cms/static/coffee/src/views/unit.coffee | 22 ++++++++++++++++++++-- cms/static/sass/_cms_mixins.scss | 12 ++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/cms/static/coffee/src/views/unit.coffee b/cms/static/coffee/src/views/unit.coffee index a4ec53f68e..0f354af09c 100644 --- a/cms/static/coffee/src/views/unit.coffee +++ b/cms/static/coffee/src/views/unit.coffee @@ -12,11 +12,15 @@ class CMS.Views.UnitEdit extends Backbone.View 'change #visibility': 'setVisibility' initialize: => - @visibility_view = new CMS.Views.UnitEdit.Visibility( + @visibilityView = new CMS.Views.UnitEdit.Visibility( el: @$('#visibility') model: @model ) - @visibility_view.render() + + @saveView = new CMS.Views.UnitEdit.SaveDraftButton( + el: @$('#save-draft') + model: @model + ) @model.on('change:state', @render) @@ -149,7 +153,21 @@ class CMS.Views.UnitEdit extends Backbone.View class CMS.Views.UnitEdit.Visibility extends Backbone.View initialize: => @model.on('change:state', @render) + @render() render: => @$el.val(@model.get('state')) +class CMS.Views.UnitEdit.SaveDraftButton extends Backbone.View + initialize: => + @model.on('change:children', @enable) + @model.on('change:metadata', @enable) + @model.on('sync', @disable) + + @disable() + + disable: => + @$el.addClass('disabled') + + enable: => + @$el.removeClass('disabled') \ No newline at end of file diff --git a/cms/static/sass/_cms_mixins.scss b/cms/static/sass/_cms_mixins.scss index c1d8245e36..dc536e323a 100644 --- a/cms/static/sass/_cms_mixins.scss +++ b/cms/static/sass/_cms_mixins.scss @@ -16,6 +16,18 @@ @include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset, 0 0 0 rgba(0, 0, 0, 0)); @include transition(background-color .15s, box-shadow .15s); + &.disabled { + border: 1px solid $darkGrey !important; + border-radius: 3px !important; + background: $lightGrey !important; + color: #fff !important; + pointer-events: none; + cursor: none; + &:hover { + box-shadow: 0 0 0 0 !important; + } + } + &:hover { @include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset, 0 1px 1px rgba(0, 0, 0, .15)); } From 81b6d7579681f43d1a6dc72b327f987b94d8d1ee Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Fri, 5 Oct 2012 14:24:56 -0400 Subject: [PATCH 17/29] tweaked disabled button --- cms/static/sass/_cms_mixins.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cms/static/sass/_cms_mixins.scss b/cms/static/sass/_cms_mixins.scss index dc536e323a..df8d06db9c 100644 --- a/cms/static/sass/_cms_mixins.scss +++ b/cms/static/sass/_cms_mixins.scss @@ -17,10 +17,10 @@ @include transition(background-color .15s, box-shadow .15s); &.disabled { - border: 1px solid $darkGrey !important; + border: 1px solid $lightGrey !important; border-radius: 3px !important; background: $lightGrey !important; - color: #fff !important; + color: $darkGrey !important; pointer-events: none; cursor: none; &:hover { From bd5d5f14191cdaa33524500ad111b3ecfebec6b4 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 5 Oct 2012 16:35:06 -0400 Subject: [PATCH 18/29] Make location view state update as the state changes on the unit page --- cms/static/coffee/src/views/unit.coffee | 12 ++++++++++++ cms/static/sass/_cms_mixins.scss | 26 ++++++++++++++++++++++--- cms/static/sass/_graphics.scss | 7 +++---- cms/templates/widgets/units.html | 5 +++-- 4 files changed, 41 insertions(+), 9 deletions(-) diff --git a/cms/static/coffee/src/views/unit.coffee b/cms/static/coffee/src/views/unit.coffee index 0f354af09c..0f7f803745 100644 --- a/cms/static/coffee/src/views/unit.coffee +++ b/cms/static/coffee/src/views/unit.coffee @@ -22,6 +22,11 @@ class CMS.Views.UnitEdit extends Backbone.View model: @model ) + @locationView = new CMS.Views.UnitEdit.LocationState( + el: @$('.section-item.editing a') + model: @model + ) + @model.on('change:state', @render) @$newComponentItem = @$('.new-component-item') @@ -150,6 +155,13 @@ class CMS.Views.UnitEdit extends Backbone.View @model.set('state', @$('#visibility').val()) ) +class CMS.Views.UnitEdit.LocationState extends Backbone.View + initialize: => + @model.on('change:state', @render) + + render: => + @$el.toggleClass("#{@model.previous('state')}-item #{@model.get('state')}-item") + class CMS.Views.UnitEdit.Visibility extends Backbone.View initialize: => @model.on('change:state', @render) diff --git a/cms/static/sass/_cms_mixins.scss b/cms/static/sass/_cms_mixins.scss index df8d06db9c..efe4556b50 100644 --- a/cms/static/sass/_cms_mixins.scss +++ b/cms/static/sass/_cms_mixins.scss @@ -173,13 +173,33 @@ background: #fffcf1; } - .draft-item, - .hidden-item, + .draft-item:after, + .public-item:after, + .private-item:after { + margin-left: 3px; + font-size: 9px; + font-weight: 600; + text-transform: uppercase; + } + + .draft-item:after { + content: "- draft"; + } + + .public-item:after { + content: "- public"; + } + + .private-item:after { + content: "- private"; + } + + .public-item, .private-item { color: #a4aab7; } - .has-new-draft-item { + .draft-item { color: #9f7d10; } } diff --git a/cms/static/sass/_graphics.scss b/cms/static/sass/_graphics.scss index 65c827981a..2214c333e0 100644 --- a/cms/static/sass/_graphics.scss +++ b/cms/static/sass/_graphics.scss @@ -117,9 +117,8 @@ } .draft-tag, -.hidden-tag, -.private-tag, -.has-new-draft-tag { +.public-tag, +.private-tag { margin-left: 3px; font-size: 9px; font-weight: 600; @@ -127,7 +126,7 @@ color: #a4aab7; } -.has-new-draft-tag { +.draft-tag { color: #9f7d10; } diff --git a/cms/templates/widgets/units.html b/cms/templates/widgets/units.html index 67e956561c..13bf73fec6 100644 --- a/cms/templates/widgets/units.html +++ b/cms/templates/widgets/units.html @@ -1,4 +1,5 @@ <%! from django.core.urlresolvers import reverse %> +<%! from contentstore.utils import compute_unit_state %>