Fix conflic

fuel/app/classes/controller/rest/library.php

@@ -1,52 +1,52 @@
-<?php
-
-use Fuel\Core\Controller_Rest;
-use Fuel\Core\FuelException;
-use Fuel\Core\Input;
-
-class Controller_Rest_Library extends Controller_Rest
-{
-    public function post_permission()
-    {
-        try {
-            $library_id = Input::post('library_id');
-            $right_name = Input::post('right_name');
-            $checked = Input::post('checked');
-            $parameter = Input::post('parameter');
-
-            if ($library_id === null || $right_name === null || $checked === null)
-                throw new FuelException('Missing parameters');
-
-            $permission = Model_Permission::find_one_by('name', $right_name);
-
-            $permission_id = $permission->id;
-
-            $library_permission = Model_Library_Permission::find_one_by(function ($query) use ($library_id, $permission_id) {
-                $query
-                    ->where('library_id', $library_id)
-                    ->and_where('permission_id', $permission_id);
-            });
-
-
-            if ($library_permission === null) {
-                $library_permission = new Model_Library_Permission();
-                $library_permission->library_id = $library_id;
-                $library_permission->permission_id = $permission_id;
-            }
-
-            if ($checked === 'false')
-                $library_permission->disable = true;
-            else
-                $library_permission->disable = false;
-
-            if($parameter !== null)
-                $library_permission->value = $parameter;
-
-            $library_permission->save();
-
-            return $this->response(['error' => false, 'message' => 'Permission modify successfully']);
-        } catch (Exception $exception) {
-            return $this->response(['error' => true, 'message' => $exception->getMessage()]);
-        }
-    }
-}
+<?php
+
+use Fuel\Core\Controller_Rest;
+use Fuel\Core\FuelException;
+use Fuel\Core\Input;
+
+class Controller_Rest_Library extends Controller_Rest
+{
+    public function post_permission()
+    {
+        try {
+            $library_id = Input::post('library_id');
+            $right_name = Input::post('right_name');
+            $checked = Input::post('checked');
+            $parameter = Input::post('parameter');
+
+            if ($library_id === null || $right_name === null || $checked === null)
+                throw new FuelException('Missing parameters');
+
+            $permission = Model_Permission::find_one_by('name', $right_name);
+
+            $permission_id = $permission->id;
+
+            $library_permission = Model_Library_Permission::find_one_by(function ($query) use ($library_id, $permission_id) {
+                $query
+                    ->where('library_id', $library_id)
+                    ->and_where('permission_id', $permission_id);
+            });
+
+
+            if ($library_permission === null) {
+                $library_permission = new Model_Library_Permission();
+                $library_permission->library_id = $library_id;
+                $library_permission->permission_id = $permission_id;
+            }
+
+            if ($checked === 'false')
+                $library_permission->disable = true;
+            else
+                $library_permission->disable = false;
+
+            if($parameter !== null)
+                $library_permission->value = $parameter;
+
+            $library_permission->save();
+
+            return $this->response(['error' => false, 'message' => 'Permission modify successfully']);
+        } catch (Exception $exception) {
+            return $this->response(['error' => true, 'message' => $exception->getMessage()]);
+        }
+    }
+}

fuel/app/classes/model/library/permission.php

@@ -1,17 +1,17 @@
-<?php
-
-
-
-class Model_Library_Permission extends Model_Overwrite
-{
-    protected static $_table_name = 'library_permission';
-    protected static $_primary_key = 'id';
-    protected static $_properties = array(
-        'id',
-        'permission_id',
-        'library_id',
-        'value',
-        'disable'
-    );
-
-}
+<?php
+
+
+
+class Model_Library_Permission extends Model_Overwrite
+{
+    protected static $_table_name = 'library_permission';
+    protected static $_primary_key = 'id';
+    protected static $_properties = array(
+        'id',
+        'permission_id',
+        'library_id',
+        'value',
+        'disable'
+    );
+
+}

fuel/app/classes/model/movie.php

@@ -536,4 +536,4 @@ class Model_Movie extends Model_Overwrite
         $trailer = new Model_Trailer($this->originalTitle ?: $this->title, $this->year, $this->type);
         $this->trailer = $trailer->trailer;
     }
-}
+}

fuel/app/views/layout/nav_bar_header.php

@@ -65,4 +65,4 @@
     <i class="alert-icon glyphicon cardio"></i>
     <span class="status"></span>
 </div>
-<div class="alert-bar-container"></div>
+<div class="alert-bar-container"></div>

fuel/app/views/settings/libraries/permissions.php

@@ -46,4 +46,4 @@
             });
         });
     });
-</script>
+</script>

public/assets/js/player.js

@@ -474,4 +474,4 @@ Slider.prototype.handleClick = function (event) {
     this.valueNow = parseInt(((this.valueMax - this.valueMin) * diffX) / this.railWidth);
     this.moveSliderTo(this.valueNow);
 
-};
+};