825 add toggle to add/remove current site to/from element sites

rdmo/__init__.py

@@ -1 +1 @@
-__version__ = "2.1.2.dev1"
+__version__ = "2.2.0.dev1"

rdmo/core/permissions.py

@@ -74,3 +74,14 @@ def has_permission(self, request, view):
             return True
         else:
             return False
+
+
+class CanToggleElementCurrentSite(DjangoModelPermissions):
+
+    perms_map = {
+        'PUT': ['%(app_label)s.change_%(model_name)s_toggle_site'],
+    }
+
+    @log_result
+    def has_permission(self, request, view):
+        return super().has_permission(request, view)

rdmo/core/tests/__init__.py

@@ -59,7 +59,15 @@
         'bar-user': 404, 'bar-reviewer': 403, 'bar-editor': 204,
         'user': 404, 'example-reviewer': 403, 'example-editor': 204,
         'anonymous': 401, 'reviewer': 403, 'editor': 204,
-    }
+    },
+    'toggle-site': {
+        # foo-editor is not permitted to apply own site(foo.com) in test run(example.com)
+        'foo-user': 403, 'foo-reviewer': 403, 'foo-editor': 403,
+        # bar-editor is not permitted to apply own site(bar.com) in test run(example.com)
+        'bar-user': 403, 'bar-reviewer': 403, 'bar-editor': 403,
+        'user': 403, 'example-reviewer': 403, 'example-editor': 200,
+        'anonymous': 401, 'reviewer': 403, 'editor': 200,
+    },
 }
 
 
@@ -115,6 +123,25 @@
             'example-reviewer': 404, 'example-editor': 404,
         }
     },
+    'toggle-site': {
+        'all-element': {
+            # foo-editor can not apply own site(foo.com) in test run(example.com)
+            'foo-reviewer': 403, 'foo-editor': 403,
+            # bar-editor can not apply own site(bar.com) in test run(example.com)
+            'bar-reviewer': 403, 'bar-editor': 403,
+            'example-reviewer': 403, 'example-editor': 200,
+        },
+        'foo-element': {
+            'foo-reviewer': 403, 'foo-editor': 403,
+            'bar-reviewer': 403, 'bar-editor': 403,
+            'example-reviewer': 403, 'example-editor': 200,
+        },
+        'bar-element': {
+            'foo-reviewer': 403, 'foo-editor': 403,
+            'bar-reviewer': 403, 'bar-editor': 403,
+            'example-reviewer': 403, 'example-editor': 200,
+        }
+    }
 }
 
 

rdmo/core/tests/test_views.py

@@ -7,6 +7,8 @@
     ('reviewer', 'reviewer'),
     ('user', 'user'),
     ('api', 'api'),
+    ('example-editor', 'example-editor'),
+    ('example-reviewer', 'example-reviewer'),
 )
 
 
@@ -57,7 +59,7 @@ def test_i18n_switcher(db, client):
 def test_can_view_management(db, client, username, password):
     client.login(username=username, password=password)
     response = client.get(reverse('management'))
-    if username in ('editor', 'reviewer', 'api'):
+    if username in ('editor', 'reviewer', 'api', 'example-editor', 'example-reviewer'):
         assert response.status_code == 200
     else:
         assert response.status_code == 403

rdmo/management/assets/js/actions/elementActions.js

@@ -342,14 +342,15 @@ export function fetchElementError(error) {
 
 // store element
 
-export function storeElement(elementType, element, back) {
+export function storeElement(elementType, element, elementAction = null, back = false) {
   return function(dispatch, getState) {
-    dispatch(storeElementInit(element))
+
+    dispatch(storeElementInit(element, elementAction))
 
     let action
     switch (elementType) {
       case 'catalogs':
-        action = () => QuestionsApi.storeCatalog(element)
+        action = () => QuestionsApi.storeCatalog(element, elementAction)
         break
 
       case 'sections':
@@ -385,11 +386,11 @@ export function storeElement(elementType, element, back) {
         break
 
       case 'tasks':
-        action = () => TasksApi.storeTask(element)
+        action = () => TasksApi.storeTask(element, elementAction)
         break
 
       case 'views':
-        action = () => ViewsApi.storeView(element)
+        action = () => ViewsApi.storeView(element, elementAction)
         break
     }
 
@@ -406,8 +407,8 @@ export function storeElement(elementType, element, back) {
   }
 }
 
-export function storeElementInit(element) {
-  return {type: 'elements/storeElementInit', element}
+export function storeElementInit(element, elementAction) {
+  return {type: 'elements/storeElementInit', element, elementAction}
 }
 
 export function storeElementSuccess(element) {
@@ -574,7 +575,6 @@ export function deleteElement(elementType, element) {
       case 'catalogs':
         action = () => QuestionsApi.deleteCatalog(element)
         break
-
       case 'sections':
         action = () => QuestionsApi.deleteSection(element)
         break
@@ -653,9 +653,9 @@ export function dropElement(dragElement, dropElement, mode) {
       const element = {...getState().elements.element}
       const { dragParent, dropParent } = moveElement(element, dragElement, dropElement, mode)
 
-      dispatch(storeElement(elementTypes[dragParent.model], dragParent))
-      if (!isNil(dropParent)) {
-        dispatch(storeElement(elementTypes[dropParent.model], dropParent))
+    dispatch(storeElement(elementTypes[dragParent.model], dragParent))
+    if (!isNil(dropParent)) {
+      dispatch(storeElement(elementTypes[dropParent.model], dropParent))
       }
     }
   }

rdmo/management/assets/js/api/QuestionsApi.js

@@ -17,11 +17,12 @@ class QuestionsApi extends BaseApi {
     return this.get(url)
   }
 
-  static storeCatalog(catalog) {
+  static storeCatalog(catalog, action) {
     if (isNil(catalog.id)) {
       return this.post('/api/v1/questions/catalogs/', catalog)
     } else {
-      return this.put(`/api/v1/questions/catalogs/${catalog.id}/`, catalog)
+      const actionPath = isNil(action) ? '' : `${action}/`
+      return this.put(`/api/v1/questions/catalogs/${catalog.id}/${actionPath}`, catalog)
     }
   }
 

rdmo/management/assets/js/api/TasksApi.js

@@ -14,11 +14,12 @@ class TasksApi extends BaseApi {
     return this.get(`/api/v1/tasks/tasks/${id}/`)
   }
 
-  static storeTask(task) {
+  static storeTask(task, action) {
     if (isNil(task.id)) {
       return this.post('/api/v1/tasks/tasks/', task)
     } else {
-      return this.put(`/api/v1/tasks/tasks/${task.id}/`, task)
+      const actionPath = isNil(action) ? '' : `${action}/`
+      return this.put(`/api/v1/tasks/tasks/${task.id}/${actionPath}`, task)
     }
   }
 

rdmo/management/assets/js/api/ViewsApi.js

@@ -14,11 +14,12 @@ class ViewsApi extends BaseApi {
     return this.get(`/api/v1/views/views/${id}/`)
   }
 
-  static storeView(view) {
+  static storeView(view, action) {
     if (isNil(view.id)) {
       return this.post('/api/v1/views/views/', view)
     } else {
-      return this.put(`/api/v1/views/views/${view.id}/`, view)
+      const actionPath = isNil(action) ? '' : `${action}/`
+      return this.put(`/api/v1/views/views/${view.id}/${actionPath}`, view)
     }
   }
 

rdmo/management/assets/js/components/common/Icons.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 
 const ReadOnlyIcon = ({ title, show }) => {
   return show && (
-    <i className="fa fa-ban" title={title}></i>
+    <i className="element-button fa fa-ban" title={title}></i>
   )
 }
 

rdmo/management/assets/js/components/common/Links.js

@@ -103,6 +103,26 @@ LockedLink.propTypes = {
   disabled: PropTypes.bool
 }
 
+const ToggleCurrentSiteLink = ({ hasCurrentSite, locked, onClick, show }) => {
+  const className = classNames({
+    'element-btn-link fa': true,
+    'fa-plus-square-o': !hasCurrentSite,
+    'fa-minus-square-o': hasCurrentSite,
+  })
+  const title = hasCurrentSite ? gettext('Remove your site'): gettext('Add your site')
+
+  return  show && <LinkButton className={className} title={locked ? gettext('Locked') : title}
+                     disabled={locked} onClick={onClick} />
+}
+
+ToggleCurrentSiteLink.propTypes = {
+  hasCurrentSite: PropTypes.bool.isRequired,
+  locked: PropTypes.bool.isRequired,
+  onClick: PropTypes.func.isRequired,
+  show: PropTypes.bool
+}
+
+
 const ShowElementsLink = ({ showElements, show, onClick }) => {
   const className = classNames({
     'element-btn-link fa': true,
@@ -242,5 +262,5 @@ ShowLink.propTypes = {
   onClick: PropTypes.func.isRequired
 }
 
-export { EditLink, CopyLink, AddLink, AvailableLink, LockedLink, ShowElementsLink,
+export { EditLink, CopyLink, AddLink, AvailableLink, ToggleCurrentSiteLink, LockedLink, ShowElementsLink,
          NestedLink, ExportLink, ExtendLink, CodeLink, ErrorLink, WarningLink, ShowLink }

rdmo/management/assets/js/components/edit/EditAttribute.js

@@ -23,7 +23,7 @@ const EditAttribute = ({ config, attribute, elements, elementActions }) => {
 
   const editAttribute = (attribute) => elementActions.fetchElement('attributes', attribute)
   const updateAttribute = (key, value) => elementActions.updateElement(attribute, {[key]: value})
-  const storeAttribute = (back) => elementActions.storeElement('attributes', attribute, back)
+  const storeAttribute = (back) => elementActions.storeElement('attributes', attribute, elementAction, back)
   const deleteAttribute = () => elementActions.deleteElement('attributes', attribute)
 
   const [showDeleteModal, openDeleteModal, closeDeleteModal] = useDeleteModal()

rdmo/management/assets/js/components/edit/EditCatalog.js

@@ -25,7 +25,7 @@ const EditCatalog = ({ config, catalog, elements, elementActions }) => {
   const { elementAction, sections } = elements
 
   const updateCatalog = (key, value) => elementActions.updateElement(catalog, {[key]: value})
-  const storeCatalog = (back) => elementActions.storeElement('catalogs', catalog, back)
+  const storeCatalog = (back) => elementActions.storeElement('catalogs', catalog, elementAction, back)
   const deleteCatalog = () => elementActions.deleteElement('catalogs', catalog)
 
   const editSection = (value) => elementActions.fetchElement('sections', value.section)

rdmo/management/assets/js/components/edit/EditCondition.js

@@ -22,7 +22,7 @@ const EditCondition = ({ config, condition, elements, elementActions }) => {
   const { elementAction, parent, attributes, options } = elements
 
   const updateCondition = (key, value) => elementActions.updateElement(condition, {[key]: value})
-  const storeCondition = (back) => elementActions.storeElement('conditions', condition, back)
+  const storeCondition = (back) => elementActions.storeElement('conditions', condition, elementAction, back)
   const deleteCondition = () => elementActions.deleteElement('conditions', condition)
 
   const editAttribute = (attribute) => elementActions.fetchElement('attributes', attribute)

rdmo/management/assets/js/components/edit/EditOption.js

@@ -24,7 +24,7 @@ const EditOption = ({ config, option, elements, elementActions }) => {
   const { elementAction, parent } = elements
 
   const updateOption = (key, value) => elementActions.updateElement(option, {[key]: value})
-  const storeOption = (back) => elementActions.storeElement('options', option, back)
+  const storeOption = (back) => elementActions.storeElement('options', option, elementAction, back)
   const deleteOption = () => elementActions.deleteElement('options', option)
 
   const [showDeleteModal, openDeleteModal, closeDeleteModal] = useDeleteModal()

rdmo/management/assets/js/components/edit/EditOptionSet.js

@@ -25,7 +25,7 @@ const EditOptionSet = ({ config, optionset, elements, elementActions }) => {
   const { elementAction, parent, conditions, options } = elements
 
   const updateOptionSet = (key, value) => elementActions.updateElement(optionset, {[key]: value})
-  const storeOptionSet = (back) => elementActions.storeElement('optionsets', optionset, back)
+  const storeOptionSet = (back) => elementActions.storeElement('optionsets', optionset, elementAction, back)
   const deleteOptionSet = () => elementActions.deleteElement('optionsets', optionset)
 
   const editOption = (value) => elementActions.fetchElement('options', value.option)

rdmo/management/assets/js/components/edit/EditPage.js

@@ -45,7 +45,7 @@ const EditPage = ({ config, page, elements, elementActions }) => {
       elementActions.updateElement(page, { [key]: value })
     }
   }
-  const storePage = (back) => elementActions.storeElement('pages', page, back)
+  const storePage = (back) => elementActions.storeElement('pages', page, elementAction, back)
   const deletePage = () => elementActions.deleteElement('pages', page)
 
   const editElement = (value) => {

rdmo/management/assets/js/components/edit/EditQuestion.js

@@ -24,7 +24,7 @@ const EditQuestion = ({ config, question, elements, elementActions}) => {
   const { elementAction, parent, attributes, optionsets, options, conditions } = elements
 
   const updateQuestion = (key, value) => elementActions.updateElement(question, {[key]: value})
-  const storeQuestion = (back) => elementActions.storeElement('questions', question, back)
+  const storeQuestion = (back) => elementActions.storeElement('questions', question, elementAction, back)
   const deleteQuestion = () => elementActions.deleteElement('questions', question)
 
   const editOptionSet = (optionset) => elementActions.fetchElement('optionsets', optionset)

rdmo/management/assets/js/components/edit/EditQuestionSet.js

@@ -45,7 +45,7 @@ const EditQuestionSet = ({ config, questionset, elements, elementActions }) => {
       elementActions.updateElement(questionset, { [key]: value })
     }
   }
-  const storeQuestionSet = (back) => elementActions.storeElement('questionsets', questionset, back)
+  const storeQuestionSet = (back) => elementActions.storeElement('questionsets', questionset, elementAction, back)
   const deleteQuestionSet = () => elementActions.deleteElement('questionsets', questionset)
 
   const editElement = (value) => {

rdmo/management/assets/js/components/edit/EditSection.js

@@ -24,7 +24,7 @@ const EditSection = ({ config, section, elements, elementActions }) => {
   const { elementAction, parent, pages } = elements
 
   const updateSection = (key, value) => elementActions.updateElement(section, {[key]: value})
-  const storeSection = (back) => elementActions.storeElement('sections', section, back)
+  const storeSection = (back) => elementActions.storeElement('sections', section, elementAction, back)
   const deleteSection = () => elementActions.deleteElement('sections', section)
 
   const editPage = (value) => elementActions.fetchElement('pages', value.page)

rdmo/management/assets/js/components/edit/EditTask.js

@@ -25,7 +25,7 @@ const EditTask = ({ config, task, elements, elementActions}) => {
   const { elementAction, attributes, catalogs, conditions } = elements
 
   const updateTask = (key, value) => elementActions.updateElement(task, {[key]: value})
-  const storeTask = (back) => elementActions.storeElement('tasks', task, back)
+  const storeTask = (back) => elementActions.storeElement('tasks', task, elementAction, back)
   const deleteTask = () => elementActions.deleteElement('tasks', task)
 
   const editCondition = (condition) => elementActions.fetchElement('conditions', condition)

rdmo/management/assets/js/components/edit/EditView.js

@@ -25,7 +25,7 @@ const EditView = ({ config, view, elements, elementActions }) => {
   const { elementAction, catalogs } = elements
 
   const updateView = (key, value) => elementActions.updateElement(view, {[key]: value})
-  const storeView = (back) => elementActions.storeElement('views', view, back)
+  const storeView = (back) => elementActions.storeElement('views', view, elementAction, back)
   const deleteView = () => elementActions.deleteElement('views', view)
 
   const [showDeleteModal, openDeleteModal, closeDeleteModal] = useDeleteModal()

rdmo/management/assets/js/components/element/Catalog.js

@@ -6,7 +6,7 @@ import { filterElement } from '../../utils/filter'
 import { buildPath } from '../../utils/location'
 
 import { ElementErrors } from '../common/Errors'
-import { EditLink, CopyLink, AddLink, AvailableLink, LockedLink, NestedLink,
+import { EditLink, CopyLink, AddLink, AvailableLink, ToggleCurrentSiteLink, LockedLink, NestedLink,
          ExportLink, CodeLink } from '../common/Links'
 import { ReadOnlyIcon } from '../common/Icons'
 
@@ -27,11 +27,17 @@ const Catalog = ({ config, catalog, elementActions, display='list',
   const toggleAvailable = () => elementActions.storeElement('catalogs', {...catalog, available: !catalog.available })
   const toggleLocked = () => elementActions.storeElement('catalogs', {...catalog, locked: !catalog.locked })
 
+  const toggleCurrentSite = () => elementActions.storeElement('catalogs', catalog, 'toggle-site')
+
   const createSection = () => elementActions.createElement('sections', { catalog })
 
   const elementNode = (
     <div className="element">
       <div className="pull-right">
+        <ToggleCurrentSiteLink hasCurrentSite={config.settings.multisite ? catalog.sites.includes(config.currentSite.id) : true}
+                               locked={catalog.locked}
+                               onClick={toggleCurrentSite}
+                               show={config.settings.multisite}/>
         <ReadOnlyIcon title={gettext('This catalog is read only')} show={catalog.read_only} />
         <NestedLink title={gettext('View catalog nested')} href={nestedUrl} onClick={fetchNested} />
         <EditLink title={gettext('Edit catalog')} href={editUrl} onClick={fetchEdit} />

rdmo/management/assets/js/components/element/Task.js

@@ -6,7 +6,7 @@ import { filterElement } from '../../utils/filter'
 import { buildPath } from '../../utils/location'
 
 import { ElementErrors } from '../common/Errors'
-import { EditLink, CopyLink, AvailableLink, LockedLink, ExportLink, CodeLink } from '../common/Links'
+import { EditLink, CopyLink, AvailableLink, LockedLink, ExportLink, CodeLink, ToggleCurrentSiteLink } from '../common/Links'
 import { ReadOnlyIcon } from '../common/Icons'
 
 const Task = ({ config, task, elementActions, filter=false, filterSites=false, filterEditors=false }) => {
@@ -21,13 +21,18 @@ const Task = ({ config, task, elementActions, filter=false, filterSites=false, f
   const fetchCopy = () => elementActions.fetchElement('tasks', task.id, 'copy')
   const toggleAvailable = () => elementActions.storeElement('tasks', {...task, available: !task.available })
   const toggleLocked = () => elementActions.storeElement('tasks', {...task, locked: !task.locked })
+  const toggleCurrentSite = () => elementActions.storeElement('tasks', task, 'toggle-site')
 
   const fetchCondition = (index) => elementActions.fetchElement('conditions', task.conditions[index])
 
   return showElement && (
     <li className="list-group-item">
       <div className="element">
         <div className="pull-right">
+        <ToggleCurrentSiteLink hasCurrentSite={config.settings.multisite ? task.sites.includes(config.currentSite.id) : true}
+                               locked={task.locked}
+                               onClick={toggleCurrentSite}
+                               show={config.settings.multisite}/>
           <ReadOnlyIcon title={gettext('This task is read only')} show={task.read_only} />
           <EditLink title={gettext('Edit task')} href={editUrl} onClick={fetchEdit} />
           <CopyLink title={gettext('Copy task')} href={copyUrl} onClick={fetchCopy} />