Merge pull request #833 from LearningLocker/develop

v1.13.2

Author: ryasmi

README.md

@@ -3,7 +3,6 @@
 
 [![Build Status](https://travis-ci.org/LearningLocker/learninglocker.svg?branch=master)](https://travis-ci.org/LearningLocker/learninglocker)
 [![Latest Stable Version](https://poser.pugx.org/learninglocker/learninglocker/v/stable.svg)](https://packagist.org/packages/learninglocker/learninglocker)
-[![Latest Unstable Version](https://poser.pugx.org/learninglocker/learninglocker/v/unstable.svg)](https://packagist.org/packages/learninglocker/learninglocker)
 [![Total Downloads](https://poser.pugx.org/learninglocker/learninglocker/downloads.svg)](https://packagist.org/packages/learninglocker/learninglocker)
 [![License](https://poser.pugx.org/learninglocker/learninglocker/license.svg)](http://opensource.org/licenses/GPL-3.0)
 [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/LearningLocker/learninglocker?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -14,18 +13,19 @@
 Please see our [documentation](http://docs.learninglocker.net) for installation, configuration, and usage instructions.
 
 ## Developers
-You may contribute to this project via [issues](/issues) and [pull request](/pulls), however, please see the [guidelines](/contributing.md) before doing so. You can also contribute by updating our [documentation](https://github.com/LearningLocker/docs). More information about how you can get involved can be found on the [Learning Locker website](http://learninglocker.net/community/get-involved/). You can see our list of contributors in our [contributors.md file](/contributors.md).
+You may contribute to this project by:
 
-### Getting Started
+- [Reporting issues](/issues).
+- [Updating code](/updating-code).
+- [Updating documentation](https://github.com/LearningLocker/docs).
+
+### Updating Code
 1. Install Learning Locker's [requirements](http://docs.learninglocker.net/installation/#requirements).
 2. [Install and setup](http://docs.learninglocker.net/installation/) Learning Locker.
 3. Change the code.
-4. [Test](#testing) your code. See [testing](#testing) below for more information.
+4. [Test](#testing) your code by ensuring that `./vendor/bin/phpunit` runs without any errors.
 5. Repeat from Step 3 or continue to step 6.
 6. Commit and push your changes to Github.
 7. Create a [pull request](/pulls) on Github (ensuring that you follow the [guidelines](/contributing.md)).
 
 Note that Learning Locker is built upon the [Laravel](http://laravel.com/) PHP framework. To learn more about the code structure, please view the [Laravel documentation](laravel.com/docs/).
-
-### Testing
-You should try to ensure that `./vendor/bin/phpunit` runs without any errors before submitting a pull request.

VERSION

@@ -1 +1 @@
-1.13.1
+1.13.2

app/database/migrations/2015_08_12_150203_ConsistentForeignKeyNames.php

@@ -16,7 +16,10 @@ public function up() {
       $this->changeForeignKey($db->reports, 'lrs', 'lrs_id', $lrs->_id, $convertToMongoId);
       $this->changeForeignKey($db->exports, 'lrs', 'lrs_id', $lrs->_id, $convertToMongoId);
 
-      $lrs->owner_id = $convertToMongoId($lrs->owner['_id']);
+      if (isset($lrs->owner_id)) {
+				$lrs->owner_id = $convertToMongoId($lrs->owner['_id']);
+			}
+			
       $lrs->save();
 
       echo 'Models for "'.$lrs->title.'" converted.'.PHP_EOL;

app/locker/repository/Statement/IndexOptions.php

@@ -34,13 +34,13 @@ class IndexOptions extends Options {
     'related_activities' => 'Boolean',
     'related_agents' => 'Boolean',
     'ascending' => 'Boolean',
-    'format' => 'String',
+    'format' => 'Str',
     'offset' => 'Integer',
     'limit' => 'Integer',
     'langs' => ['Language'],
     'attachments' => 'Boolean',
     'lrs_id' => null,
-    'scopes' => ['String'],
+    'scopes' => ['Str'],
     'client' => null
   ];
 

app/locker/repository/Statement/ShowOptions.php

@@ -9,7 +9,7 @@ class ShowOptions extends Options {
     'lrs_id' => null,
     'voided' => 'Boolean',
     'active' => 'Boolean',
-    'scopes' => ['String'],
+    'scopes' => ['Str'],
     'client' => null
   ];
 }

app/locker/repository/Statement/StoreOptions.php

@@ -5,7 +5,7 @@ class StoreOptions extends Options {
   protected $types = [
     'lrs_id' => null,
     'authority' => 'Authority',
-    'scopes' => ['String'],
+    'scopes' => ['Str'],
     'client' => null
   ];
 }

app/models/Report.php

@@ -117,8 +117,12 @@ public function getWhereAttribute() {
           }
         }
       }
-      array_push($wheres, ['orArray', 'or', $actorArray]);
-      array_push($wheres, ['orArray', 'or', $instructorArray]);
+      if (!empty($actorArray)) {
+        array_push($wheres, ['orArray', 'or', $actorArray]);
+      }
+      if (!empty($instructorArray)) {
+        array_push($wheres, ['orArray', 'or', $instructorArray]);
+      }
     }
 
     $since = isset($reportArr['since']) ? $this->constructDate($reportArr['since']) : null;
@@ -132,6 +136,7 @@ public function getWhereAttribute() {
       $wheres[] = ['statement.timestamp', '<=', $until];
     }
 
+
     return $wheres;
   }
 

composer.lock

@@ -18,8 +18,7 @@ define([
       if (query[field] == null) {
         query[field] = ['<>', '', ''];
       }
-
-      query[field][1 + !!min] = e.currentTarget.value;
+      query[field][1 + !!min] = parseInt(e.currentTarget.value);
     });
   };
   var clearQueryField = function (field) {
@@ -125,4 +124,4 @@ define([
       languages: typeaheadHelpers.view('languages', 'Language', 'en-GB', typeaheadHelpers.displayItem)
     }
   });
-});
+});