Merge pull request #583 from LearningLocker/develop

v1.3.10

Author: ryasmi

README.md

@@ -17,7 +17,7 @@ Please see our [documentation](http://docs.learninglocker.net) for installation,
 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).
 
 ### Getting Started
-1. Install Learning Locker's [requirements](http://docs.learninglocker.net/requirements/).
+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.

VERSION

@@ -1 +1 @@
-1.3.9
+1.3.10

app/commands/StatementMigrateCommand.php

@@ -55,7 +55,7 @@ public function fire() {
         });
 
         // Uses the repository to migrate the statements.
-        $repo = App::make('Locker\Repository\Statement\EloquentStatementRepository');
+        $repo = App::make('Locker\Repository\Statement\EloquentVoider');
         $repo->updateReferences($statements_array, $lrs);
         $repo->voidStatements($statements_array, $lrs);
 

app/controllers/ClientController.php

@@ -1,158 +1,113 @@
 <?php
 
-use Locker\Repository\User\UserRepository as User;
-use Locker\Repository\Lrs\LrsRepository as Lrs;
-use Locker\Repository\Client\ClientRepository as Client; 
+use Locker\Repository\User\UserRepository as UserRepo;
+use Locker\Repository\Lrs\Repository as LrsRepo;
+use Locker\Repository\Client\ClientRepository as ClientRepo; 
 
 class ClientController extends BaseController {
 
-  /**
-  * User
-  */
-  protected $user;
-
-  /**
-   * Lrs
-   **/
-  protected $lrs;
+  protected $user, $lrs, $client;
 
   /**
-   * Client
-   **/
-  protected $client;
-  
-
-  /**
-   * Construct
-   *
-   * @param User $user
-   * @param Lrs $lrs
-   * @param Client $client
+   * Constructs a new ClientController.
+   * @param UserRepo $user
+   * @param LrsRepo $lrs
+   * @param ClientRepo $client
    */
-  public function __construct(User $user, Lrs $lrs, Client $client){
-
+  public function __construct(UserRepo $user, LrsRepo $lrs, ClientRepo $client) {
     $this->user = $user;
-    $this->lrs  = $lrs;
-	$this->client  = $client;
-    $this->logged_in_user = Auth::user();
-    
+    $this->lrs = $lrs;
+	  $this->client = $client;
   }
 
   /**
-   * Load the manage clients page
-   *
-   * @param  int  $id
+   * Load the manage clients page.
+   * @param String $lrs_id
    * @return View
    */
-  public function manage($id){
-  	
-     $lrs    = $this->lrs->find( $id );
-     $lrs_list = $this->lrs->all(); 
-	
-	 $clients = \Client::where('lrs_id', $lrs->id)->get();
-	 	  
-	 
-     return View::make('partials.client.manage', array('clients'    => $clients,
-						                        'lrs'           => $lrs,
-						                        'list'          => $lrs_list
-												));
+  public function manage($lrs_id) {
+    $opts = ['user' => \Auth::user()];
+    $lrs = $this->lrs->show($lrs_id, $opts);
+    $lrs_list = $this->lrs->index($opts); 
+	  $clients = \Client::where('lrs_id', $lrs->id)->get();
+    return View::make('partials.client.manage', [
+      'clients' => $clients,
+      'lrs' => $lrs,
+      'list' => $lrs_list
+		]);
   }
 
    /**
-   * Load the manage clients page
-   *
-   * @param  int  $lrs_id
-   * @param  int  $id
+   * Load the manage clients page.
+   * @param String $lrs_id
+   * @param String $id
    * @return View
    */
-  public function edit($lrs_id, $id){
-  	
-     $lrs    = $this->lrs->find( $lrs_id );
-     $lrs_list = $this->lrs->all(); 
-	
-	 $client = $this->client->find( $id );
-	 	  
-	 
-     return View::make('partials.client.edit', array('client'    => $client,
-						                        'lrs'           => $lrs,
-						                        'list'          => $lrs_list
-												));
+  public function edit($lrs_id, $id) {
+    $opts = ['user' => \Auth::user()];
+    $lrs = $this->lrs->show($lrs_id, $opts);
+    $lrs_list = $this->lrs->index($opts); 
+	  $client = $this->client->find($id);
+	 	return View::make('partials.client.edit', [
+      'client' => $client,
+      'lrs' => $lrs,
+      'list' => $lrs_list
+		]);
   }
 
-    /**
-   * Create a new client
-   *
-   * @param  int  $id
+  /**
+   * Create a new client.
+   * @param String $lrs_id
    * @return View
-   **/
-
-  public function create($id){
-
-	$lrs = $this->lrs->find( $id );
-	
-	$data = array('lrs_id' => $lrs->id);
+   */
+  public function create($lrs_id) {
+    $opts = ['user' => \Auth::user()];
+    $lrs = $this->lrs->show($lrs_id, $opts);
+	  $data = ['lrs_id' => $lrs->id];
 
-    if( $this->client->create( $data ) ){
+    if ($this->client->create($data)) {
       $message_type = 'success';
-      $message      = Lang::get('update_key');
-    }else{
+      $message = trans('lrs.client.created_sucecss');
+    } else {
       $message_type = 'error';
-      $message      = Lang::get('update_key_error');
+      $message = trans('lrs.client.created_fail');
     }
 
     return Redirect::back()->with($message_type, $message);
   }
 
   /**
    * Update the specified resource in storage.
-   *
-   * @param  int  $id
+   * @param String $lrs_id Id of the LRS.
+   * @param String $id Id of the client.
    * @return View
    */
   public function update($lrs_id, $id){
-
-    /*$data = Input::all();
-
-    //TODO :client input validation This may be able to re-use some of the statement validator
-    $rules['title']        = 'required|alpha_spaces';
-    $rules['description']  = 'alpha_spaces';       
-    $validator = Validator::make($data, $rules);
-    if ($validator->fails()) return Redirect::back()->withErrors($validator);
-	 */
-
-	 
-	//{{ URL() }}/lrs/{{ $lrs->_id }}/client/manage#{{ $client->_id }} 
-	
-    if($this->client->update( $id, Input::all() )){
-      return Redirect::to('/lrs/'.$lrs_id.'/client/manage#'.$id)->with('success', Lang::get('lrs.client.updated'));
+    if ($this->client->update($id, Input::all())) {
+      $redirect_url = '/lrs/'.$lrs_id.'/client/manage#'.$id;
+      return Redirect::to($redirect_url)->with('success', trans('lrs.client.updated'));
     }
 
     return Redirect::back()
-          ->withInput()
-          ->withErrors($this->client->errors());
-
+      ->withInput()
+      ->withErrors($this->client->errors());
   }
 
-
   /**
    * Remove the specified resource from storage.
-   *
-   * @param  int  $lrs_id
-   * @param  int  $id
+   * @param String $lrs_id
+   * @param String $id
    * @return View
    */
   public function destroy($lrs_id, $id){
-
-	if( $this->client->delete($id) ){
+	  if ($this->client->delete($id)) {
       $message_type = 'success';
-      $message      = Lang::get('delete_client_success');
-    }else{
+      $message = trans('lrs.client.delete_client_success');
+    } else {
       $message_type = 'error';
-      $message      = Lang::get('delete_client_error');
+      $message = trans('lrs.client.delete_client_error');
     }
 
-   return Redirect::back()->with($message_type, $message);
-
+    return Redirect::back()->with($message_type, $message);
   }
-
-}
+}

app/controllers/ExplorerController.php

@@ -1,28 +1,27 @@
 <?php
 
-use Locker\Repository\Lrs\LrsRepository as Lrs;
+use Locker\Repository\Lrs\Repository as LrsRepo;
 
 class ExportingController extends \BaseController {
 
   protected $views = 'partials.exports';
   protected $lrs;
 
-  public function __construct(Lrs $lrs){
+  public function __construct(LrsRepo $lrs){
     $this->lrs = $lrs;
-    
     $this->beforeFilter('auth');
     $this->beforeFilter('auth.lrs'); //check user can access LRS.
     $this->beforeFilter('csrf', array('only' => array('update', 'store', 'destroy')));
   }
 
   /**
    * Display a listing of the resource.
-   *
-   * @return Response
+   * @return View
    */
   public function index($id){
-    $lrs      = $this->lrs->find( $id );
-    $lrs_list = $this->lrs->all();
+    $opts = ['user' => \Auth::user()];
+    $lrs = $this->lrs->show($id, $opts);
+    $lrs_list = $this->lrs->index($opts);
     return View::make("{$this->views}.index", [
       'lrs' => $lrs, 
       'list' => $lrs_list,