dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed "shareing" to "shared" table columns

Browse Source
This commit is contained in:
Exodus4D
2016-01-21 20:29:38 +01:00
parent d1fbdf8a95
commit b4d15c3fd9
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/controller/api/access.php
View File

@@ -58,7 +58,7 @@ class Access extends \Controller\AccessController {
$accessList = $accessModel->find( array(
"LOWER(name) LIKE :token AND " .
"active = 1 AND " .
"sharing = 1 ",
"shared = 1 ",
':token' => '%' . $searchToken . '%'
));

6
app/main/controller/api/map.php
View File

@@ -318,7 +318,7 @@ class Map extends \Controller\AccessController {
if(
!$tempUser->dry() &&
$tempUser->sharing == 1 // check if map sharing is enabled
$tempUser->shared == 1 // check if map shared is enabled
){
$map->setAccess($tempUser);
}
@@ -355,7 +355,7 @@ class Map extends \Controller\AccessController {
if(
!$tempCorporation->dry() &&
$tempCorporation->sharing == 1 // check if map sharing is enabled
$tempCorporation->shared == 1 // check if map shared is enabled
){
$map->setAccess($tempCorporation);
}
@@ -393,7 +393,7 @@ class Map extends \Controller\AccessController {
if(
!$tempAlliance->dry() &&
$tempAlliance->sharing == 1 // check if map sharing is enabled
$tempAlliance->shared == 1 // check if map shared is enabled
){
$map->setAccess($tempAlliance);
}

6
app/main/controller/api/user.php
View File

@@ -198,7 +198,7 @@ class User extends Controller\Controller{
}
}
$user->sharing = $privateSharing;
$user->shared = $privateSharing;
$user->save();
// update corp/ally ---------------------------------------------------------------
@@ -210,12 +210,12 @@ class User extends Controller\Controller{
$alliance = $activeUserCharacter->getCharacter()->getAlliance();
if(is_object($corporation)){
$corporation->sharing = $corporationSharing;
$corporation->shared = $corporationSharing;
$corporation->save();
}
if(is_object($alliance)){
$alliance->sharing = $allianceSharing;
$alliance->shared = $allianceSharing;
$alliance->save();
}
}

4
app/main/model/alliancemodel.php
View File

@@ -26,7 +26,7 @@ class AllianceModel extends BasicModel {
'nullable' => false,
'default' => ''
],
'sharing' => [
'shared' => [
'type' => Schema::DT_BOOL,
'nullable' => false,
'default' => 0
@@ -48,7 +48,7 @@ class AllianceModel extends BasicModel {
$allianceData->id = $this->id;
$allianceData->name = $this->name;
$allianceData->sharing = $this->sharing;
$allianceData->shared = $this->shared;
return $allianceData;
}

4
app/main/model/corporationmodel.php
View File

@@ -26,7 +26,7 @@ class CorporationModel extends BasicModel {
'nullable' => false,
'default' => ''
],
'sharing' => [
'shared' => [
'type' => Schema::DT_BOOL,
'nullable' => false,
'default' => 0
@@ -48,7 +48,7 @@ class CorporationModel extends BasicModel {
$cooperationData->id = $this->id;
$cooperationData->name = $this->name;
$cooperationData->sharing = $this->sharing;
$cooperationData->shared = $this->shared;
return $cooperationData;
}

4
app/main/model/usermodel.php
View File

@@ -96,8 +96,8 @@ class UserModel extends BasicModel {
// add sensitive user data
$userData->email = $this->email;
// user sharing info
$userData->sharing = $this->sharing;
// user shared info
$userData->shared = $this->shared;
// api data
$APIs = $this->getAPIs();

6
public/templates/dialog/sharing_settings.html
View File

@@ -23,7 +23,7 @@
<div class="col-sm-9">
<div class="checkbox col-sm-10">
<label for="privateSharing">
<input id="privateSharing" type="checkbox" name="privateSharing" data-toggle="toggle" value="1" {{#userData.sharing}}checked{{/userData.sharing}}>
<input id="privateSharing" type="checkbox" name="privateSharing" data-toggle="toggle" value="1" {{#userData.shared}}checked{{/userData.shared}}>
&nbsp;map invite for private maps
</label>
</div>
@@ -41,7 +41,7 @@
<div class="col-sm-9">
<div class="checkbox col-sm-10">
<label for="corporationSharing">
<input id="corporationSharing" type="checkbox" name="corporationSharing" data-toggle="toggle" value="1" {{#sharing}}checked{{/sharing}}>
<input id="corporationSharing" type="checkbox" name="corporationSharing" data-toggle="toggle" value="1" {{#shared}}checked{{/shared}}>
&nbsp;map invite for corporation maps
</label>
</div>
@@ -60,7 +60,7 @@
<div class="col-sm-9">
<div class="checkbox col-sm-10">
<label for="allianceSharing">
<input id="allianceSharing" type="checkbox" name="allianceSharing" data-toggle="toggle" value="1" {{#sharing}}checked{{/sharing}}>
<input id="allianceSharing" type="checkbox" name="allianceSharing" data-toggle="toggle" value="1" {{#shared}}checked{{/shared}}>
&nbsp;map invite for alliance maps
</label>
</div>