Merge branch 'release/v1.9.0'

Author: paulloz

Makefile

@@ -22,7 +22,7 @@ endif
 
 all: install startdb run
 
-run: clean
+run: clean startdb
 	. $(ENV) ; python -W ignore::DeprecationWarning manage.py rqworker high default low &
 	. $(ENV) ; python -W ignore::DeprecationWarning manage.py runserver --nothreading 0.0.0.0:$(PORT)
 
@@ -109,9 +109,7 @@ test:
 	make startdb
 	./manage.py syncdb -v 0 --noinput  --traceback --pythonpath=. --settings=app.settings_tests
 	# Launch test with coverage
-	-python -W ignore::DeprecationWarning $(COVERAGE) run --source=app.detective ./manage.py test $(TEST) --pythonpath=. --settings=app.settings_tests --traceback
-	# Send report to coveralls
-	coveralls
+	-python -W ignore::DeprecationWarning manage.py test $(TEST) --pythonpath=. --settings=app.settings_tests --traceback
 	# Stop database in order to restore it
 	make stopdb
 	# Remove temporary databases

README.md

@@ -5,7 +5,7 @@
 [License](https://github.com/jplusplus/detective.io/blob/master/LICENSE) •
 [Test coverage](https://coveralls.io/r/jplusplus/detective.io) •
 [Documentation](http://docs.detective.io/en/latest/) •
-*Version 1.8.0 Alligator*
+*Version 1.9.0 Baboon*
 
 ## Installation
 

app/detective/admin.py

@@ -98,6 +98,7 @@ class TopicAdmin(admin.ModelAdmin):
     list_display        = ("title", "link", "public","app_label")
     list_filter         = ("public","featured","author")
     readonly_fields     = ('entities_count',)
+    actions             = ['duplicate']
     suit_form_tabs      = (
         ('general', 'General'),
         ('advanced', 'Advanced Settings'),
@@ -137,10 +138,33 @@ def get_form(self, request, obj=None, **kwargs):
             self.inlines = []
         return super(TopicAdmin, self).get_form(request, obj, **kwargs)
 
+    def duplicate(self, request, queryset):
+        import re
+        for topic in queryset:
+            exist    = True
+            new_slug  = topic.slug
+            new_title = topic.title
+            while exist:
+                match = re.search("-new-(\d+)$", new_slug)
+                if match:
+                    old_id     = match.group(1)
+                    new_slug   = new_slug.rstrip(old_id)
+                    new_slug  += unicode(int(old_id) + 1)
+                    new_title  = new_title.rstrip(old_id)
+                    new_title += unicode(int(old_id) + 1)
+                else:
+                    new_slug  += "-new-1"
+                    new_title += " 1"
+                exist = Topic.objects.filter(slug=new_slug).exists()
+            topic.pk              = None
+            topic.title           = new_title
+            topic.slug            = new_slug
+            topic.ontology_as_mod = None
+            topic.save()
+    duplicate.short_description = "Duplicate the topic without nodes"
 
 admin.site.register(Topic, TopicAdmin)
 
-
 class TopicSkeletonForm(forms.ModelForm):
     target_plans = forms.MultipleChoiceField(choices=PLANS_CHOICES)
 

app/detective/fixtures/tests_pillen.json

@@ -4,7 +4,7 @@
     "pk": 4,
     "fields": {
         "description": "Test Pillen.",
-        "title": "Test me",
+        "title": "Test pillen",
         "slug": "test-pillen",
         "ontology_as_json": "[ {\"fields\":[ {\"verbose_name\":\"Name\",\"name\":\"name\",\"type\":\"string\"}, {\"verbose_name\":\"Logo\",\"name\":\"logo\",\"type\":\"string\"}, {\"verbose_name\":\"Picture front\",\"name\":\"image\",\"type\":\"url\"}, {\"verbose_name\":\"Picture back\",\"name\":\"image_back\",\"type\":\"url\"}, {\"verbose_name\":\"Break notch\",\"help_text\":\"DE:Bruchrille\",\"name\":\"break_notch\",\"type\":\"boolean\"}, {\"verbose_name\":\"Color\",\"help_text\":\"DE:Farbe\",\"name\":\"color\",\"type\":\"string\"}, {\"verbose_name\":\"Weight (in milligrams)\",\"help_text\":\"DE:Gewicht. Note: please use dots to separate decimals\",\"name\":\"weight\",\"type\":\"string\"}, {\"verbose_name\":\"Diameter (in millimeters)\",\"help_text\":\"DE:Durchmesser. Note: please use dots to separate decimals\",\"name\":\"diameter\",\"type\":\"string\"}, {\"verbose_name\":\"Thickness (in millimeters)\",\"help_text\":\"DE:Dicke. Note: please use dots to separate decimals\",\"name\":\"thickness\",\"type\":\"string\"}, {\"verbose_name\":\"Place\",\"help_text\":\"DE:Ort\",\"name\":\"place\",\"type\":\"string\"}, {\"verbose_name\":\"Date\",\"help_text\":\"DE:Datum\",\"name\":\"date\",\"type\":\"date\"}, {\"verbose_name\":\"More infos\",\"help_text\":\"DE:Mehr infos. Please, insert a valid URL.\",\"name\":\"more_infos\",\"type\":\"url\"}, {\"verbose_name\":\"Molecules contained\",\"related_name\":\"pills_that_contain_this_molecule\",\"fields\":[ {\"type\":\"string\",\"help_text\":\"Note: please use dots to separate decimals\",\"name\":\"quantity (in milligrams).\" }],\"help_text\":\"All molecules this pills contains\",\"name\":\"molecules_contained\",\"type\":\"relationship\",\"related_model\":\"molecule\" }],\"verbose_name\":\"Pill\",\"name\":\"pill\",\"verbose_name_plural\":\"Pills\"}, {\"fields\":[ {\"verbose_name\":\"Name\",\"name\":\"name\",\"type\":\"string\"}, {\"verbose_name\":\"Toxicity threshold\",\"help_text\":\"Max threshold for one pill. If the threshold is exceeded, a warning can be display.\",\"name\":\"toxicity_threshold\",\"type\":\"string\"}, {\"verbose_name\":\"Description\",\"name\":\"description\",\"type\":\"string\",\"rules\":{\"is_rich\":true } }],\"verbose_name\":\"Molecule\",\"help_text\":\"DE:Molek\u00fcl\",\"name\":\"molecule\",\"verbose_name_plural\":\"Molecules\"}]",
         "ontology_as_owl": null,
@@ -16,6 +16,4 @@
         "author": 100000
     }
 }
-]
-
-
+]

app/detective/individual.py

@@ -3,6 +3,7 @@
 from app.detective                      import register, graph
 from app.detective.neomatch             import Neomatch
 from app.detective.utils                import import_class, to_underscores, get_model_topic, get_leafs_and_edges, get_topic_from_request, get_model_fields
+from app.detective.utils                import get_model_fields as utils_get_model_fields
 from app.detective.topics.common.models import FieldSource
 from app.detective.models               import Topic
 from django.conf.urls                   import url
@@ -28,6 +29,7 @@
 import json
 import re
 import logging
+import bleach
 
 logger = logging.getLogger(__name__)
 
@@ -510,13 +512,14 @@ def validate(self, data, model=None, allow_missing=False):
                 # Boolean field must be validate manually
                 if field.get_internal_type() == 'BooleanField':
                     if type(data[field_name]) is not bool:
+                        raise ValidationError({field_name: 'Must be a boolean value'})
                         if not allow_missing:
                             raise ValidationError({field_name: 'Must be a boolean value'})
                         # Skip this field
                         else: continue
                     cleaned_data[field_name] = data[field_name]
                 # Only literal values have a _property attribute
-                if hasattr(field, "_property"):
+                elif hasattr(field, "_property"):
                     try:
                         try:
                             # Get a single field validator
@@ -583,6 +586,8 @@ def get_patch(self, request, **kwargs):
         self.authorized_update_detail(self.get_object_list(bundle.request), bundle)
         # Current model
         model = self.get_model()
+        # Fields
+        fields = { x['name'] : x for x in utils_get_model_fields(model) }
         # Get the node's data using the rest API
         try: node = connection.nodes.get(pk)
         # Node not found
@@ -672,7 +677,17 @@ def get_patch(self, request, **kwargs):
                     except client.NotFoundError: pass
                 # We simply update the node property
                 # (the value is already validated)
-                else: node.set(field_name, field_value)
+                else:
+                    if field_name in fields:
+                        if 'is_rich' in fields[field_name]['rules'] and fields[field_name]['rules']['is_rich']:
+                            data[field_name] = field_value = bleach.clean(field_value,
+                                                                          tags=("br", "blockquote", "ul", "ol",
+                                                                                "li", "b", "i", "u", "a", "p"),
+                                                                          attributes={
+                                                                              '*': ("class",),
+                                                                              'a': ("href", "target")
+                                                                          })
+                    node.set(field_name, field_value)
 
         # And returns cleaned data
         return self.create_response(request, data)

app/detective/models.py

@@ -646,23 +646,19 @@ def update_topic_cache(*args, **kwargs):
             # previously stored information related to this topic
             utils.topic_cache.incr_version(topic)
 
-def remove_topic_cache(*args, **kwargs):
-    utils.topic_cache.delete_version(kwargs.get('instance'))
-
 def delete_entity(*args, **kwargs):
     fields = utils.get_model_fields(kwargs.get('instance').__class__)
     for field in fields:
-        if field["rel_type"] and "through" in field["rules"]:
+        if field["rel_type"] and "through" in field["rules"] and field["rules"]["through"] != None:
             Properties = field["rules"]["through"]
             for info in Properties.objects.all():
                 info.delete()
     update_topic_cache(*args, **kwargs)
 
-signals.post_delete.connect(remove_permissions , sender=Topic)
 signals.post_save.connect(user_created         , sender=User)
 signals.post_save.connect(update_topic_cache   , sender=Topic)
 signals.post_save.connect(update_permissions   , sender=Topic)
-signals.pre_delete.connect(remove_topic_cache  , sender=Topic)
+signals.post_delete.connect(update_topic_cache , sender=Topic)
 signals.post_delete.connect(remove_permissions , sender=Topic)
 
 # EOF

app/detective/static/detective/css/account.login.less

@@ -1,9 +0,0 @@
-.login-form {
-    width:500px;
-    margin-left:auto;
-    margin-right:auto;
-
-    @media(max-width: @screen-xs-max){ // for mobile
-        width: 100%;
-    }
-}

app/detective/static/detective/css/account.settings.less

@@ -0,0 +1,12 @@
+html body .account-settings {
+    .panel-default {
+        .panel-heading {
+            background-color: @panel-default-heading-bg;
+        }
+    }
+    .panel {
+        .btn {
+            width: 180px;
+        }
+    }
+}

app/detective/static/detective/css/base.less

@@ -8,6 +8,7 @@
 @zindex-header    : @zindex-breadcrumb+100;
 // Header configuration
 @header-bg:#FFF;
+@header-border-color: #DDD;
 @header-height: 50px;
 @header-open-speed: 0.4s;
 @aside-width: 250px;
@@ -34,6 +35,7 @@
 @import './account.login.less';
 @import './account.password-reset.confirmation.less';
 @import './account.password-reset.less';
+@import './account.settings.less';
 @import './account.signup.less';
 @import './animations.less';
 @import './content.less';

app/detective/static/detective/css/bootstrap.panel.less

@@ -1,3 +1,5 @@
+
+
 html body .panel {
     color:@gray-darker;
     .border-radius(2px);
@@ -21,6 +23,40 @@ html body .panel {
         }
     }
 
+    &-centered {
+        width:500px;
+        margin-left:auto;
+        margin-right:auto;
+
+        @media(max-width: @screen-xs-max){ // for mobile
+            width: 100%;
+        }
+    }
+    .panel-shadow(@color){
+        @outside-border-color: fade(@color, 50%);
+        .box-shadow( ~"0 1px 0 @{color} inset, 0px 1px 2px @{outside-border-color}" );
+    }
+    &-danger {
+        border: 0;
+        .panel-shadow(@brand-danger);
+        .panel-heading {
+            color: white;
+            background-color: @brand-danger;
+        }
+        .panel-footer {
+            border-top: 0;
+        }
+        .btn-danger {
+            color: white;
+        }
+    }
+    &-warning {
+        border: 0;
+        .panel-shadow(@brand-warning);
+        .btn-warning {
+            color: @gray;
+        }
+    }
     &.panel-bg {
 
         &.panel-primary {