change field name from status to the more meaningful curated

crim/admin.py

@@ -567,12 +567,12 @@ def formfield_for_foreignkey(self, db_field, request, **kwargs):
             'fields': ('mt_fp_ir', 'mt_fp_range', 'mt_fp_comment'),
         }),
         ('Other', {
-            'fields': ('remarks', 'status'),
+            'fields': ('remarks', 'curated'),
         }),
     )
     list_display = (
         'id_in_brackets',
-        'status',
+        'curated',
         'observer',
         'piece',
         'created',
@@ -618,12 +618,12 @@ class CRIMRelationshipAdmin(admin.ModelAdmin):
             'fields': ('rt_om',),
         }),
         ('Other', {
-            'fields': ('remarks', 'status'),
+            'fields': ('remarks', 'curated'),
         }),
     )
     list_display = (
         'id_in_brackets',
-        'status',
+        'curated',
         'observer',
         'model_observation',
         'derivative_observation',

crim/models/mass.py

@@ -53,14 +53,14 @@ def date_sort(self):
     def models(self):
         return CRIMPiece.objects.filter(
                 relationships_as_model__derivative_piece__mass=self,
-                relationships_as_model__status=True,
+                relationships_as_model__curated=True,
             ).order_by('mass', 'piece_id').distinct()
 
     @property
     def derivatives(self):
         return CRIMPiece.objects.filter(
                 relationships_as_derivative__model_piece__mass=self,
-                relationships_as_derivative__status=True,
+                relationships_as_derivative__curated=True,
             ).order_by('mass', 'piece_id').distinct()
 
     def save(self, *args, **kwargs):

crim/models/observation.py

@@ -122,7 +122,7 @@ class Meta:
 
     created = models.DateTimeField(auto_now_add=True)
     updated = models.DateTimeField(auto_now=True)
-    status = models.BooleanField('status', default=False)
+    curated = models.BooleanField('curated', default=False)
 
     def id_in_brackets(self):
         return '<' + str(self.id) + '>'

crim/models/piece.py

@@ -102,14 +102,14 @@ def date_sort(self):
     def models(self):
         return CRIMPiece.objects.filter(
                 relationships_as_model__derivative_piece=self,
-                relationships_as_model__status=True,
+                relationships_as_model__curated=True,
             ).order_by('mass', 'piece_id').distinct()
 
     @property
     def derivatives(self):
         return CRIMPiece.objects.filter(
                 relationships_as_derivative__model_piece=self,
-                relationships_as_derivative__status=True,
+                relationships_as_derivative__curated=True,
             ).order_by('mass', 'piece_id').distinct()
 
     def get_absolute_url(self):

crim/models/relationship.py

@@ -84,7 +84,7 @@ class Meta:
 
     created = models.DateTimeField(auto_now_add=True)
     updated = models.DateTimeField(auto_now=True)
-    status = models.BooleanField('status', default=False)
+    curated = models.BooleanField('curated', default=False)
 
     def id_in_brackets(self):
         return '<R' + str(self.id) + '>'
@@ -163,7 +163,7 @@ def save(self, *args, **kwargs):
 #         solrconn.delete(record.results[0]['id'])
 #
 #     # Don't index if this relationship needs review!
-#     if not instance.status:
+#     if not instance.curated:
 #         return
 #     # The suffixes are for automatic creation of the schema using
 #     # the correct types -- see http://yonik.com/solr-tutorial/

crim/serializers/observation.py

@@ -232,5 +232,5 @@ class Meta:
             'remarks',
             'created',
             'updated',
-            'status',
+            'curated',
         )

crim/settings.py

@@ -162,7 +162,7 @@
     'remarks_t',
     'created_dt',
     'updated_dt',
-    'status_b',
+    'curated_b',
     'model_observer_s',
     'model_ema_t',
     'model_mt_cf_b',
@@ -245,7 +245,7 @@
     'model_remarks_t',
     'model_created_dt',
     'model_updated_dt',
-    'model_status_b',
+    'model_curated_b',
     'model_piece_id_s',
     'model_title_s',
     'model_mass_s',
@@ -337,7 +337,7 @@
     'derivative_remarks_t',
     'derivative_created_dt',
     'derivative_updated_dt',
-    'derivative_status_b',
+    'derivative_curated_b',
     'derivative_piece_id_s',
     'derivative_title_s',
     'derivative_mass_s',
@@ -377,7 +377,7 @@
     'remarks': 'remarks_t',
     'created': 'created_dt',
     'updated': 'updated_dt',
-    'status': 'status_b',
+    'curated': 'curated_b',
     'model-observer': 'model_observer_s',
     'model-ema': 'model_ema_t',
     'model-mt-cf': 'model_mt_cf_b',
@@ -460,7 +460,7 @@
     'model-remarks': 'model_remarks_t',
     'model-created': 'model_created_dt',
     'model-updated': 'model_updated_dt',
-    'model-status': 'model_status_b',
+    'model-curated': 'model_curated_b',
     'model-piece-id': 'model_piece_id_s',
     'model-title': 'model_title_s',
     'model-mass': 'model_mass_s',
@@ -552,7 +552,7 @@
     'derivative-remarks': 'derivative_remarks_t',
     'derivative-created': 'derivative_created_dt',
     'derivative-updated': 'derivative_updated_dt',
-    'derivative-status': 'derivative_status_b',
+    'derivative-curated': 'derivative_curated_b',
     'derivative-piece-id': 'derivative_piece_id_s',
     'derivative-title': 'derivative_title_s',
     'derivative-mass': 'derivative_mass_s',

crim/templates/observation/observation_detail.html

@@ -10,7 +10,7 @@
 
 {% block title %}
   <title>
-    CRIM | {% if content.status %}Observation{% else %}Uncurated observation{% endif %} &lt;{{ content.id }}&gt;
+    CRIM | {% if content.curated %}Observation{% else %}Uncurated observation{% endif %} &lt;{{ content.id }}&gt;
     {% if content.piece.mass %}
       {{ content.piece.mass.title }}:
     {% endif %}
@@ -24,7 +24,7 @@
 
 {% block wrap %}
   <hgroup class="page-title">
-    <h1>{% if content.status %}Observation{% else %}Uncurated observation{% endif %} <small>&lt;{{ content.id }}&gt;</small></h1>
+    <h1>{% if content.curated %}Observation{% else %}Uncurated observation{% endif %} <small>&lt;{{ content.id }}&gt;</small></h1>
     <h2>Observer: <a href="{{ content.observer.url|htmlsite }}">{{ content.observer.name }}</a></h2>
     {% for relationship in content.relationships_as_model %}
       <h3>

crim/templates/observation/observation_list.html

@@ -33,10 +33,10 @@ <h1>Observations</h1>
         <tbody>
           {% for observation in content.results %}
             <tr>
-              <td><a {% if not observation.status %}class="uncurated"{% endif %} href="{{ observation.url|htmlsite }}">&lt;{{ observation.id }}&gt;</a></td>
-              <td><a {% if not observation.status %}class="uncurated"{% endif %} href="{{ observation.observer.url|htmlsite }}">{{ observation.observer.name }}</a></td>
+              <td><a {% if not observation.curated %}class="uncurated"{% endif %} href="{{ observation.url|htmlsite }}">&lt;{{ observation.id }}&gt;</a></td>
+              <td><a {% if not observation.curated %}class="uncurated"{% endif %} href="{{ observation.observer.url|htmlsite }}">{{ observation.observer.name }}</a></td>
               <td>
-                <a {% if not observation.status %}class="uncurated"{% endif %} href="{{ observation.piece.url|htmlsite }}">
+                <a {% if not observation.curated %}class="uncurated"{% endif %} href="{{ observation.piece.url|htmlsite }}">
                   [{{ observation.piece.piece_id }}]
                   {% if observation.piece.mass %}
                     {{observation.piece.mass.title}}:
@@ -53,7 +53,7 @@ <h1>Observations</h1>
               </td>
               <td>
                 {% if observation.mt_cf or observation.mt_sog or observation.mt_csog or observation.mt_fg or observation.mt_pe or observation.mt_id or observation.mt_nid or observation.mt_hr or observation.mt_cad or observation.mt_int or observation.mt_fp %}
-                  <a href="#" class="observation-info-expand {% if not observation.status %}uncurated{% endif %}" target="observation-info-{{ forloop.counter }}">Expand</a>
+                  <a href="#" class="observation-info-expand {% if not observation.curated %}uncurated{% endif %}" target="observation-info-{{ forloop.counter }}">Expand</a>
                 {% else %}
                   -
                 {% endif %}

crim/templates/relationship/relationship_detail.html

@@ -10,7 +10,7 @@
 
 {% block title %}
   <title>
-    CRIM | {% if content.status %}Relationship{% else %}Uncurated relationship{% endif %} &lt;R{{ content.id }}&gt;
+    CRIM | {% if content.curated %}Relationship{% else %}Uncurated relationship{% endif %} &lt;R{{ content.id }}&gt;
     {% if content.model_observation.piece.mass %}
       {{ content.model_observation.piece.mass.title }}:
     {% endif %}
@@ -31,7 +31,7 @@
 {% block wrap %}
   <hgroup class="page-title">
     <h1>
-      {% if content.status %}Relationship{% else %}Uncurated relationship{% endif %}
+      {% if content.curated %}Relationship{% else %}Uncurated relationship{% endif %}
       <small>&lt;R{{ content.id }}&gt;</small>
     </h1>
     <h2>Observer: <a href="{{ content.observer.url|htmlsite }}">{{ content.observer.name }}</a></h2>

crim/templates/relationship/relationship_list.html

@@ -34,24 +34,24 @@ <h1>Relationships</h1>
         <tbody>
           {% for relationship in content.results %}
             <tr>
-              <td><a {% if not relationship.status %}class="uncurated"{% endif %} href="{{ relationship.url|htmlsite }}">&lt;R{{ relationship.id }}&gt;</a></td>
-              <td><a {% if not relationship.status %}class="uncurated"{% endif %} href="{{ relationship.observer.url|htmlsite }}">{{ relationship.observer.name }}</a></td>
+              <td><a {% if not relationship.curated %}class="uncurated"{% endif %} href="{{ relationship.url|htmlsite }}">&lt;R{{ relationship.id }}&gt;</a></td>
+              <td><a {% if not relationship.curated %}class="uncurated"{% endif %} href="{{ relationship.observer.url|htmlsite }}">{{ relationship.observer.name }}</a></td>
               <td>
-                <a {% if not relationship.status %}class="uncurated"{% endif %} href="{{ relationship.model_observation.url|htmlsite }}">
+                <a {% if not relationship.curated %}class="uncurated"{% endif %} href="{{ relationship.model_observation.url|htmlsite }}">
                   &lt;{{ relationship.model_observation.id }}&gt;
                 </a>
-                <a {% if not relationship.status %}class="uncurated"{% endif %} href="{{ relationship.model_observation.piece.url|htmlsite }}">
+                <a {% if not relationship.curated %}class="uncurated"{% endif %} href="{{ relationship.model_observation.piece.url|htmlsite }}">
                   {% if relationship.model_observation.piece.mass %}
                     {{relationship.model_observation.piece.mass.title}}:
                   {% endif %}
                   {{ relationship.model_observation.piece.title }}
                 </a>
               </td>
               <td>
-                <a {% if not relationship.status %}class="uncurated"{% endif %} href="{{ relationship.derivative_observation.url|htmlsite }}">
+                <a {% if not relationship.curated %}class="uncurated"{% endif %} href="{{ relationship.derivative_observation.url|htmlsite }}">
                   &lt;{{ relationship.derivative_observation.id }}&gt;
                 </a>
-                <a {% if not relationship.status %}class="uncurated"{% endif %} href="{{ relationship.derivative_observation.piece.url|htmlsite }}">
+                <a {% if not relationship.curated %}class="uncurated"{% endif %} href="{{ relationship.derivative_observation.piece.url|htmlsite }}">
                   {% if relationship.derivative_observation.piece.mass %}
                     {{relationship.derivative_observation.piece.mass.title}}:
                   {% endif %}
@@ -66,7 +66,7 @@ <h1>Relationships</h1>
                 {% endif %}
               </td>
               <td>
-                <a href="#" class="relationship-info-expand {% if not relationship.status %}uncurated{% endif %}" target="relationship-info-{{ forloop.counter }}">Expand</a>
+                <a href="#" class="relationship-info-expand {% if not relationship.curated %}uncurated{% endif %}" target="relationship-info-{{ forloop.counter }}">Expand</a>
               </td>
             </tr>
             <tr id="relationship-info-{{ forloop.counter }}" class="relationship-info">

crim/templates/search/indexes/crim/crimrelationship_text.txt

@@ -4,7 +4,7 @@
 {{ object.remarks }}
 {{ object.created }}
 {{ object.updated }}
-{{ object.status }}
+{{ object.curated }}
 
 {{ object.model_observation.observer.person_id }}
 {{ object.model_observation.observer.name_sort }}

crim/views/comment.py

@@ -48,7 +48,7 @@ def get(self, request, comment_id):
 
     def post(self, request, comment_id):
         comment = get_object_or_404(CRIMComment, comment_id=comment_id)
-        if not request.user.is_anonymous and (comment.author == request.user.profile or request.user.is_staff):
+        if request.user.is_authenticated and (comment.author == request.user.profile or request.user.is_staff):
             # If the "Confirm deletion" checkbox is selected and the Delete
             # button is pressed, then wipe out the text of the comment with [delete]
             # and set `alive` to False.
@@ -86,7 +86,7 @@ def get(self, request, comment_id):
 
     def post(self, request):
         comment = get_object_or_404(CRIMComment, comment_id=comment_id)
-        if request.user.is_anonymous:
+        if not request.user.is_authenticated:
             return Response(status=status.HTTP_401_UNAUTHORIZED)
         elif (comment.author != request.user.profile and not request.user.is_staff) or not comment.alive:
             return Response(status=status.HTTP_403_FORBIDDEN)
@@ -103,7 +103,7 @@ class CommentCreateData(generics.CreateAPIView):
     renderer_classes = (JSONRenderer,)
 
     def post(self, request):
-        if request.user.is_anonymous:
+        if not request.user.is_authenticated:
             return Response(status=status.HTTP_401_UNAUTHORIZED)
         else:
             comment = CRIMComment(author = request.user.profile)

crim/views/observation.py

@@ -171,10 +171,10 @@ class ObservationList(generics.ListAPIView):
 
     def get_queryset(self):
         order_by = self.request.GET.get('order_by', 'piece_id')
-        if self.request.user.is_anonymous:
-            return CRIMObservation.objects.filter(status=True).order_by(order_by)
-        else:
+        if self.request.user.is_authenticated:
             return CRIMObservation.objects.all().order_by(order_by)
+        else:
+            return CRIMObservation.objects.filter(curated=True).order_by(order_by)
 
 
 class ObservationDetail(generics.RetrieveAPIView):
@@ -206,7 +206,7 @@ class ObservationDetailData(ObservationDetail):
     def post(self, request):
         observation = get_object_or_404(CRIMObservation, id=id)
         # Not allowed to POST if there is no CRIMPerson associated with this user
-        if request.user.is_anonymous or not request.user.profile.person:
+        if not request.user.is_authenticated or not request.user.profile.person:
             return Response(status=status.HTTP_401_UNAUTHORIZED)
         elif comment.author != request.user.profile and not request.user.is_staff:
             return Response(status=status.HTTP_403_FORBIDDEN)
@@ -223,7 +223,7 @@ class ObservationCreateData(generics.CreateAPIView):
 
     def post(self, request):
         # Not allowed to POST if there is no CRIMPerson associated with this user
-        if request.user.is_anonymous or not request.user.profile.person:
+        if not request.user.is_authenticated or not request.user.profile.person:
             return Response(status=status.HTTP_401_UNAUTHORIZED)
 
         observation_or_response = create_observation_from_request(request, '')

crim/views/relationship.py

@@ -135,10 +135,10 @@ class RelationshipList(generics.ListAPIView):
 
     def get_queryset(self):
         order_by = self.request.GET.get('order_by', 'model_observation__piece_id')
-        if self.request.user.is_anonymous:
-            return CRIMRelationship.objects.filter(status=True).order_by(order_by)
-        else:
+        if self.request.user.is_authenticated:
             return CRIMRelationship.objects.all().order_by(order_by)
+        else:
+            return CRIMRelationship.objects.filter(curated=True).order_by(order_by)
 
 
 class RelationshipDetail(generics.RetrieveAPIView):
@@ -172,7 +172,7 @@ class RelationshipCreateData(generics.CreateAPIView):
 
     def post(self, request):
         # Not allowed to POST if there is no CRIMPerson associated with this user
-        if request.user.is_anonymous or not request.user.profile.person:
+        if not request.user.is_authenticated or not request.user.profile.person:
             return Response(status=status.HTTP_401_UNAUTHORIZED)
 
         # If one of the observations returns an HTTP response, return that.

crim/views/search.py

@@ -40,7 +40,7 @@ def _empty_search(request):
         'remarks': facets['remarks_t'],
         'created': facets['created_dt'],
         'updated': facets['updated_dt'],
-        'status': facets['status_b'],
+        'curated': facets['curated_b'],
         'model_observer': facets['model_observer_s'],
         'model_ema': facets['model_ema_t'],
         'model_mt_cf': facets['model_mt_cf_b'],
@@ -123,7 +123,7 @@ def _empty_search(request):
         'model_remarks': facets['model_remarks_t'],
         'model_created': facets['model_created_dt'],
         'model_updated': facets['model_updated_dt'],
-        'model_status': facets['model_status_b'],
+        'model_curated': facets['model_curated_b'],
         'model_piece_id': facets['model_piece_id_s'],
         'model_title': facets['model_title_s'],
         'model_mass': facets['model_mass_s'],
@@ -215,7 +215,7 @@ def _empty_search(request):
         'derivative_remarks': facets['derivative_remarks_t'],
         'derivative_created': facets['derivative_created_dt'],
         'derivative_updated': facets['derivative_updated_dt'],
-        'derivative_status': facets['derivative_status_b'],
+        'derivative_curated': facets['derivative_curated_b'],
         'derivative_piece_id': facets['derivative_piece_id_s'],
         'derivative_title': facets['derivative_title_s'],
         'derivative_mass': facets['derivative_mass_s'],

importing/analysis.py

@@ -89,9 +89,9 @@ def create_item(item, processed_data, unprocessed_data, log):
             new_relationship_fields['derivative_piece'] = derivative_observation_fields['piece']
             new_relationship_fields['created'] = item['created_at']
             new_relationship_fields['updated'] = item['created_at']
-            new_relationship_fields['status'] = False if 'needs_review' in item and item['needs_review'] else True
-            model_observation_fields['status'] = new_relationship_fields['status']
-            derivative_observation_fields['status'] = new_relationship_fields['status']
+            new_relationship_fields['curated'] = False if 'needs_review' in item and item['needs_review'] else True
+            model_observation_fields['curated'] = new_relationship_fields['curated']
+            derivative_observation_fields['curated'] = new_relationship_fields['curated']
             add_relationship_types(relationship_to_process, new_relationship_fields)
 
             model_observation_row = {
@@ -189,7 +189,7 @@ def add_orphan_observation(item, observation, processed_data):
     new_observation_fields['observer'] = PEOPLE[item['user']]
     new_observation_fields['created'] = item['created_at']
     new_observation_fields['updated'] = item['created_at']
-    new_observation_fields['status'] = False
+    new_observation_fields['curated'] = False
 
     OBSERVATION_COUNT += 1
     new_observation_row = {