Merge branch 'release/0.107.0'

Author: sloria

.docker-compose.env

@@ -14,4 +14,5 @@ CAS_SERVER_URL=http://192.168.168.167:8080
 MFR_SERVER_URL=http://localhost:7778
 #SHARE_URL=http://192.168.168.167:8000/
 BROKER_URL=amqp://guest:[email protected]:5672/
+LIVE_RELOAD_DOMAIN=http://192.168.168.167:4200
 REDIS_URL=redis://192.168.168.167:6379/1

.travis.yml

@@ -105,6 +105,7 @@ install:
     - cd $PROJECT_DIR
     - cp website/settings/local-travis.py website/settings/local.py
     - cp api/base/settings/local-travis.py api/base/settings/local.py
+    - '[ -d $HOME/preprints ] || ( mkdir -p $HOME/preprints && touch $HOME/preprints/index.html )'
 
     - travis_retry pip install --upgrade pip
     - travis_retry pip install invoke==0.13.0

CHANGELOG

@@ -2,6 +2,16 @@
 Changelog
 *********
 
+0.107.0 (2017-04-28)
+====================
+
+- Upgrade to Django 1.11.
+- Remove BaseFileNode.wrapped() method.
+- Remove guid_string field from models.
+- Preprints: Add LawArxiv.
+- Admin: Add Date Registration Initiated to node view.
+- Admin: Add link between projects and registrations.
+
 0.106.0 (2017-04-21)
 ====================
 

addons/osfstorage/tests/test_models.py

@@ -223,7 +223,7 @@ def test_delete_folder(self):
 
     def test_delete_file(self):
         child = self.node_settings.get_root().append_file('Test')
-        field_names = [f.name for f in child._meta.get_fields() if not f.is_relation and f.name not in ['id', 'guid_string', 'content_type_pk']]
+        field_names = [f.name for f in child._meta.get_fields() if not f.is_relation and f.name not in ['id', 'content_type_pk']]
         child_data = {f: getattr(child, f) for f in field_names}
         child.delete()
 
@@ -235,7 +235,7 @@ def test_delete_file(self):
         child_storage['materialized_path'] = child.materialized_path
         assert_equal(trashed.path, '/' + child._id)
         trashed_field_names = [f.name for f in child._meta.get_fields() if not f.is_relation and
-                               f.name not in ['id', 'guid_string', '_materialized_path', 'content_type_pk', '_path', 'deleted_on', 'deleted_by', 'type']]
+                               f.name not in ['id', '_materialized_path', 'content_type_pk', '_path', 'deleted_on', 'deleted_by', 'type']]
         for f, value in child_data.iteritems():
             if f in trashed_field_names:
                 assert_equal(getattr(trashed, f), value)

addons/wiki/migrations/0004_remove_nodewikipage_guid_string.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-04-24 21:09
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('addons_wiki', '0003_auto_20170403_2228'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='nodewikipage',
+            name='guid_string',
+        ),
+    ]

admin/base/utils.py

@@ -12,4 +12,4 @@ def reverse_qs(view, urlconf=None, args=None, kwargs=None, current_app=None, que
 
 
 def osf_staff_check(user):
-    return user.is_authenticated() and user.is_staff
+    return user.is_authenticated and user.is_staff

admin/nodes/serializers.py

@@ -24,11 +24,14 @@ def serialize_node(node):
         'children': map(serialize_simple_node, node.nodes),
         'deleted': node.is_deleted,
         'pending_registration': node.is_pending_registration,
+        'registered_date': node.registered_date,
         'creator': node.creator._id,
         'spam_status': node.spam_status,
         'spam_pro_tip': node.spam_pro_tip,
         'spam_data': json.dumps(node.spam_data, indent=4),
         'is_public': node.is_public,
+        'registrations': [serialize_node(registration) for registration in node.registrations.all()],
+        'registered_from': node.registered_from._id if node.registered_from else None
     }
 
 

admin/templates/nodes/node.html

@@ -232,7 +232,28 @@ <h3>Node Details</h3>
                 <td>Registration</td>
                 <td>
                     {% if not node.is_registration %}
-                        {{ node.is_registration }}
+                        <table class="table table-bordered table-hover">
+                                <thead>
+                                <tr>
+                                    <td>Registration</td>
+                                    <td>Date Created</td>
+                                    <td>Pending</td>
+                                    <td>Withdrawn</td>
+                                    <td>Embargo</td>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                {% for registration in node.registrations %}
+                                <tr>
+                                    <td><a href="{{ registration.id | reverse_node }}">{{ registration.id }}</a></td>
+                                    <td>{{ registration.date_created | date }}</td>
+                                    <td>{{ registration.pending_registration }}</td>
+                                    <td>{{ registration.withdrawn }}</td>
+                                    <td>{{ registration.embargo }}</td>
+                                </tr>
+                        {% endfor %}
+                                </tbody>
+                            </table>
                     {% else %}
                         <table class="table table-bordered table-hover">
                         <thead>
@@ -246,6 +267,10 @@ <h3>Node Details</h3>
                                 <td>Date Created</td>
                                 <td>{{ node.date_created | date }}</td>
                             </tr>
+                            <tr>
+                                <td>Datetime Registered (UTC)</td>
+                                <td>{{ node.registered_date | date:"F j, Y P" }}</td>
+                            </tr>
                             <tr>
                                 <td>Pending</td>
                                 <td>{{ node.pending_registration }}</td>
@@ -258,6 +283,10 @@ <h3>Node Details</h3>
                                 <td>Embargo</td>
                                 <td>{{ node.embargo }}</td>
                             </tr>
+                            <tr>
+                                <td>Registered From</td>
+                                <td><a href="{% url 'nodes:node' node.registered_from %}">{{ node.registered_from }}</a></td>
+                            </tr>
                         </tbody>
                         </table>
                     {% endif %}

api/base/middleware.py

@@ -85,7 +85,7 @@ def origin_not_found_in_white_lists(self, origin, url):
         not_found = super(CorsMiddleware, self).origin_not_found_in_white_lists(origin, url)
         if not_found:
             # Check if origin is in the dynamic Institutions whitelist
-            if url.netloc.lower() in api_settings.INSTITUTION_ORIGINS_WHITELIST:
+            if url.netloc.lower() in api_settings.ORIGINS_WHITELIST:
                 return
             # Check if a cross-origin request using the Authorization header
             elif not self._context.request.COOKIES:

api/base/pagination.py

@@ -183,7 +183,7 @@ def get_paginated_response(self, data):
             node_id = kwargs.get('node_id', None)
             node = Node.load(node_id)
             user = self.request.user
-            if target_id and not user.is_anonymous() and node.is_contributor(user):
+            if target_id and not user.is_anonymous and node.is_contributor(user):
                 root_target = Guid.load(target_id)
                 if root_target:
                     page = getattr(root_target.referent, 'root_target_page', None)