';
diff --git a/webroot/js/likes.js b/webroot/js/likes.js
index e63edbc..f0bc72f 100644
--- a/webroot/js/likes.js
+++ b/webroot/js/likes.js
@@ -23,23 +23,32 @@ NetCommonsApp.factory('LikesSave', ['$http', '$q', 'NC3_URL', function($http, $q
};
}]);
-function request($http, $q, NC3_URL, params, isGetMethod) {
+function request($http, $q, NC3_URL, params, isLoad) {
var deferred = $q.defer();
var promise = deferred.promise;
$http.get(NC3_URL + '/net_commons/net_commons/csrfToken.json')
.then(function(response) {
- console.log(params);
-
- var data = isGetMethod ? { action: 'load', contentKey: params.Like.content_key, _Token: {} } : params;
+ var url = NC3_URL;
+ params = Object.assign({}, params);
+ if (isLoad) {
+ params._Token = params.load._Token;
+ url += '/likes/likes/load.json';
+ delete params.LikesUser;
+ } else {
+ params._Token = params.save._Token;
+ url += '/likes/likes/save.json';
+ }
+ delete params.load;
+ delete params.save;
var token = response.data;
- data._Token.key = token.data._Token.key;
+ params._Token.key = token.data._Token.key;
// POSTリクエスト
$http.post(
- NC3_URL + '/likes/likes/like.json',
- $.param({ _method: 'POST', data: data }),
+ url,
+ $.param({ _method: 'POST', data: params }),
{
cache: false,
headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
@@ -113,6 +122,8 @@ NetCommonsApp.controller('Likes', ['$scope', 'LikesLoad', 'LikesSave', function(
$scope.initialize = function(data, options) {
$scope.data = data;
$scope.options = options;
+ $scope.options.disabled = true;
+
LikesLoad($scope.data)
.success(function(data) {
$scope.options.disabled = data.disabled;
@@ -127,6 +138,7 @@ NetCommonsApp.controller('Likes', ['$scope', 'LikesLoad', 'LikesSave', function(
* @return {void}
*/
$scope.save = function(isLiked) {
+ $scope.data.LikesUser.is_liked = isLiked;
if ($scope.options.disabled) {
return;
}
@@ -134,19 +146,19 @@ NetCommonsApp.controller('Likes', ['$scope', 'LikesLoad', 'LikesSave', function(
$scope.sending = true;
LikesSave($scope.data)
- .success(function() {
- $scope.sending = false;
- //success condition
- if (isLiked) {
- $scope.options.likeCount += 1;
- } else {
- $scope.options.unlikeCount += 1;
- }
- })
- .error(function() {
- //error condition
- $scope.sending = false;
- });
+ .success(function(data) {
+ $scope.sending = false;
+ //success condition
+ if (isLiked) {
+ $scope.options.likeCount += 1;
+ } else {
+ $scope.options.unlikeCount += 1;
+ }
+ })
+ .error(function() {
+ //error condition
+ $scope.sending = false;
+ });
};
}]);
From 4ef19d099be86cb1adf4ae0146ee356ba2c209ba Mon Sep 17 00:00:00 2001
From: "Sakamoto, Kazunori"
Date: Fri, 10 Jan 2020 13:17:36 +0900
Subject: [PATCH 24/36] implementing ...
---
Controller/LikesController.php | 2 --
1 file changed, 2 deletions(-)
diff --git a/Controller/LikesController.php b/Controller/LikesController.php
index 4064bd5..b573e81 100644
--- a/Controller/LikesController.php
+++ b/Controller/LikesController.php
@@ -98,11 +98,9 @@ public function save() {
'conditions' => array('content_key' => $data['Like']['content_key'])
));
$data = Hash::merge($like, $data);
-
if ($this->Like->saveLike($data)) {
return;
}
-
$this->NetCommons->handleValidationError($this->Like->validationErrors);
}
}
From 809f3840dd4a330af65f321bd0981836ca1b5856 Mon Sep 17 00:00:00 2001
From: "Sakamoto, Kazunori"
Date: Fri, 10 Jan 2020 13:19:03 +0900
Subject: [PATCH 25/36] implementing ...
---
webroot/js/likes.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webroot/js/likes.js b/webroot/js/likes.js
index f0bc72f..ddc97bb 100644
--- a/webroot/js/likes.js
+++ b/webroot/js/likes.js
@@ -146,7 +146,7 @@ NetCommonsApp.controller('Likes', ['$scope', 'LikesLoad', 'LikesSave', function(
$scope.sending = true;
LikesSave($scope.data)
- .success(function(data) {
+ .success(function() {
$scope.sending = false;
//success condition
if (isLiked) {
From a7511c38c3d5d7c530dbc9b13d4e45003f918e7c Mon Sep 17 00:00:00 2001
From: "Sakamoto, Kazunori"
Date: Sat, 11 Jan 2020 22:13:26 +0900
Subject: [PATCH 26/36] deal with a review comment
---
Controller/LikesController.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Controller/LikesController.php b/Controller/LikesController.php
index b573e81..7af9ac7 100644
--- a/Controller/LikesController.php
+++ b/Controller/LikesController.php
@@ -64,7 +64,7 @@ public function load() {
if (Current::read('User.id')) {
$likesUserConditions['user_id'] = Current::read('User.id');
} else {
- $likesUserConditions['session_key'] = Session::id();
+ $likesUserConditions['session_key'] = $this->Session->id();
}
$likesUserCount = $this->LikesUser->find('count', array(
From 4b38bcab299034e8c6d93953e36af2e246dacd60 Mon Sep 17 00:00:00 2001
From: "Sakamoto, Kazunori"
Date: Thu, 23 Jan 2020 00:30:32 +0900
Subject: [PATCH 27/36] fix: don't expose a function unnecessarily
---
webroot/js/likes.js | 157 ++++++++++++++++++++++----------------------
1 file changed, 80 insertions(+), 77 deletions(-)
diff --git a/webroot/js/likes.js b/webroot/js/likes.js
index ddc97bb..b50756b 100644
--- a/webroot/js/likes.js
+++ b/webroot/js/likes.js
@@ -5,86 +5,88 @@
*/
-/**
- * Likes Service Javascript
- *
- * @param {string} Controller name
- * @param {function('$http', '$q')} Controller
- */
-NetCommonsApp.factory('LikesLoad', ['$http', '$q', 'NC3_URL', function($http, $q, NC3_URL) {
- return function(data) {
- return request($http, $q, NC3_URL, data, true);
- };
-}]);
-
-NetCommonsApp.factory('LikesSave', ['$http', '$q', 'NC3_URL', function($http, $q, NC3_URL) {
- return function(data) {
- return request($http, $q, NC3_URL, data, false);
- };
-}]);
-
-function request($http, $q, NC3_URL, params, isLoad) {
- var deferred = $q.defer();
- var promise = deferred.promise;
-
- $http.get(NC3_URL + '/net_commons/net_commons/csrfToken.json')
- .then(function(response) {
- var url = NC3_URL;
- params = Object.assign({}, params);
- if (isLoad) {
- params._Token = params.load._Token;
- url += '/likes/likes/load.json';
- delete params.LikesUser;
- } else {
- params._Token = params.save._Token;
- url += '/likes/likes/save.json';
- }
- delete params.load;
- delete params.save;
-
- var token = response.data;
- params._Token.key = token.data._Token.key;
-
- // POSTリクエスト
- $http.post(
- url,
- $.param({ _method: 'POST', data: params }),
- {
- cache: false,
- headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+(function() {
+ /**
+ * Likes Service Javascript
+ *
+ * @param {string} Controller name
+ * @param {function('$http', '$q')} Controller
+ */
+ NetCommonsApp.factory('LikesLoad', ['$http', '$q', 'NC3_URL', function($http, $q, NC3_URL) {
+ return function(data) {
+ return request($http, $q, NC3_URL, data, true);
+ };
+ }]);
+
+ NetCommonsApp.factory('LikesSave', ['$http', '$q', 'NC3_URL', function($http, $q, NC3_URL) {
+ return function(data) {
+ return request($http, $q, NC3_URL, data, false);
+ };
+ }]);
+
+ function request($http, $q, NC3_URL, params, isLoad) {
+ var deferred = $q.defer();
+ var promise = deferred.promise;
+
+ $http.get(NC3_URL + '/net_commons/net_commons/csrfToken.json')
+ .then(function(response) {
+ var url = NC3_URL;
+ params = Object.assign({}, params);
+ if (isLoad) {
+ params._Token = params.load._Token;
+ url += '/likes/likes/load.json';
+ delete params.LikesUser;
+ } else {
+ params._Token = params.save._Token;
+ url += '/likes/likes/save.json';
}
- ).then(
- function(response) {
- //success condition
- var data = response.data;
- deferred.resolve(data);
- },
- function(response) {
- //error condition
- var data = response.data;
- var status = response.status;
- deferred.reject(data, status);
- });
- },
- function(response) {
- //Token error condition
- var data = response.data;
- var status = response.status;
- deferred.reject(data, status);
- });
+ delete params.load;
+ delete params.save;
+
+ var token = response.data;
+ params._Token.key = token.data._Token.key;
+
+ // POSTリクエスト
+ $http.post(
+ url,
+ $.param({ _method: 'POST', data: params }),
+ {
+ cache: false,
+ headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+ }
+ ).then(
+ function(response) {
+ //success condition
+ var data = response.data;
+ deferred.resolve(data);
+ },
+ function(response) {
+ //error condition
+ var data = response.data;
+ var status = response.status;
+ deferred.reject(data, status);
+ });
+ },
+ function(response) {
+ //Token error condition
+ var data = response.data;
+ var status = response.status;
+ deferred.reject(data, status);
+ });
+
+ promise.success = function(fn) {
+ promise.then(fn);
+ return promise;
+ };
+
+ promise.error = function(fn) {
+ promise.then(null, fn);
+ return promise;
+ };
- promise.success = function(fn) {
- promise.then(fn);
return promise;
- };
-
- promise.error = function(fn) {
- promise.then(null, fn);
- return promise;
- };
-
- return promise;
-}
+ }
+})();
/**
* Likes Controller Javascript
@@ -200,3 +202,4 @@ NetCommonsApp.controller('LikeSettings', ['$scope', function($scope) {
}
};
}]);
+
From 52c5d894092d6818dabfb825b88331d5d0d7421c Mon Sep 17 00:00:00 2001
From: "Sakamoto, Kazunori"
Date: Thu, 23 Jan 2020 18:07:36 +0900
Subject: [PATCH 28/36] fix: allow calling load function before logging-in
---
Controller/LikesController.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/Controller/LikesController.php b/Controller/LikesController.php
index 7af9ac7..8ba40b6 100644
--- a/Controller/LikesController.php
+++ b/Controller/LikesController.php
@@ -38,6 +38,7 @@ class LikesController extends LikesAppController {
*/
public function beforeFilter() {
parent::beforeFilter();
+ $this->Auth->allow('load');
$this->Auth->allow('save');
}
From 19c7e47d744f9860e8ea504721bb1d46b6444bc8 Mon Sep 17 00:00:00 2001
From: "Sakamoto, Kazunori"
Date: Thu, 6 Feb 2020 23:33:07 +0900
Subject: [PATCH 29/36] fix: use jQuery's ajax to disable browser cache (#54)
---
webroot/js/likes.js | 90 +++++++++++++++++++--------------------------
1 file changed, 38 insertions(+), 52 deletions(-)
diff --git a/webroot/js/likes.js b/webroot/js/likes.js
index b50756b..eef9482 100644
--- a/webroot/js/likes.js
+++ b/webroot/js/likes.js
@@ -10,69 +10,58 @@
* Likes Service Javascript
*
* @param {string} Controller name
- * @param {function('$http', '$q')} Controller
+ * @param {function('$q')} Controller
*/
- NetCommonsApp.factory('LikesLoad', ['$http', '$q', 'NC3_URL', function($http, $q, NC3_URL) {
+ NetCommonsApp.factory('LikesLoad', ['$q', 'NC3_URL', function($q, NC3_URL) {
return function(data) {
- return request($http, $q, NC3_URL, data, true);
+ return request($q, NC3_URL, data, true);
};
}]);
- NetCommonsApp.factory('LikesSave', ['$http', '$q', 'NC3_URL', function($http, $q, NC3_URL) {
+ NetCommonsApp.factory('LikesSave', ['$q', 'NC3_URL', function($q, NC3_URL) {
return function(data) {
- return request($http, $q, NC3_URL, data, false);
+ return request($q, NC3_URL, data, false);
};
}]);
- function request($http, $q, NC3_URL, params, isLoad) {
+ function request($q, NC3_URL, params, isLoad) {
var deferred = $q.defer();
var promise = deferred.promise;
- $http.get(NC3_URL + '/net_commons/net_commons/csrfToken.json')
- .then(function(response) {
- var url = NC3_URL;
- params = Object.assign({}, params);
- if (isLoad) {
- params._Token = params.load._Token;
- url += '/likes/likes/load.json';
- delete params.LikesUser;
- } else {
- params._Token = params.save._Token;
- url += '/likes/likes/save.json';
+ $.ajax({
+ url: NC3_URL + '/net_commons/net_commons/csrfToken.json', cache: false, success: function(data) {
+ var url = NC3_URL;
+ params = Object.assign({}, params);
+ if (isLoad) {
+ params._Token = params.load._Token;
+ url += '/likes/likes/load.json';
+ delete params.LikesUser;
+ } else {
+ params._Token = params.save._Token;
+ url += '/likes/likes/save.json';
+ }
+ delete params.load;
+ delete params.save;
+
+ var token = data;
+ params._Token.key = token.data._Token.key;
+ $.ajax({
+ url: url,
+ method: 'POST',
+ cache: false,
+ data: $.param({data: params}),
+ contentType: 'application/x-www-form-urlencoded',
+ success: function(data) {
+ deferred.resolve(data);
+ },
+ error: function(jqXHR) {
+ deferred.reject(jqXHR.responseText, jqXHR.status);
}
- delete params.load;
- delete params.save;
-
- var token = response.data;
- params._Token.key = token.data._Token.key;
-
- // POSTリクエスト
- $http.post(
- url,
- $.param({ _method: 'POST', data: params }),
- {
- cache: false,
- headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
- }
- ).then(
- function(response) {
- //success condition
- var data = response.data;
- deferred.resolve(data);
- },
- function(response) {
- //error condition
- var data = response.data;
- var status = response.status;
- deferred.reject(data, status);
- });
- },
- function(response) {
- //Token error condition
- var data = response.data;
- var status = response.status;
- deferred.reject(data, status);
});
+ }, error: function(jqXHR) {
+ deferred.reject(jqXHR.responseText, jqXHR.status);
+ }
+ });
promise.success = function(fn) {
promise.then(fn);
@@ -150,7 +139,6 @@ NetCommonsApp.controller('Likes', ['$scope', 'LikesLoad', 'LikesSave', function(
LikesSave($scope.data)
.success(function() {
$scope.sending = false;
- //success condition
if (isLiked) {
$scope.options.likeCount += 1;
} else {
@@ -158,7 +146,6 @@ NetCommonsApp.controller('Likes', ['$scope', 'LikesLoad', 'LikesSave', function(
}
})
.error(function() {
- //error condition
$scope.sending = false;
});
};
@@ -202,4 +189,3 @@ NetCommonsApp.controller('LikeSettings', ['$scope', function($scope) {
}
};
}]);
-
From c6b4dd6325a8230874ded8436ecfdce7d1127a0f Mon Sep 17 00:00:00 2001
From: "Sakamoto, Kazunori"
Date: Fri, 21 Feb 2020 12:21:27 +0900
Subject: [PATCH 30/36] fix: revert Ajax code to use AngularJS
---
webroot/js/likes.js | 87 +++++++++++++++++++++++++--------------------
1 file changed, 49 insertions(+), 38 deletions(-)
diff --git a/webroot/js/likes.js b/webroot/js/likes.js
index eef9482..ba6ffce 100644
--- a/webroot/js/likes.js
+++ b/webroot/js/likes.js
@@ -10,58 +10,69 @@
* Likes Service Javascript
*
* @param {string} Controller name
- * @param {function('$q')} Controller
+ * @param {function('$http', '$q')} Controller
*/
- NetCommonsApp.factory('LikesLoad', ['$q', 'NC3_URL', function($q, NC3_URL) {
+ NetCommonsApp.factory('LikesLoad', ['$http', '$q', 'NC3_URL', function($http, $q, NC3_URL) {
return function(data) {
- return request($q, NC3_URL, data, true);
+ return request($http, $q, NC3_URL, data, true);
};
}]);
- NetCommonsApp.factory('LikesSave', ['$q', 'NC3_URL', function($q, NC3_URL) {
+ NetCommonsApp.factory('LikesSave', ['$http', '$q', 'NC3_URL', function($http, $q, NC3_URL) {
return function(data) {
- return request($q, NC3_URL, data, false);
+ return request($http, $q, NC3_URL, data, false);
};
}]);
- function request($q, NC3_URL, params, isLoad) {
+ function request($http, $q, NC3_URL, params, isLoad) {
var deferred = $q.defer();
var promise = deferred.promise;
- $.ajax({
- url: NC3_URL + '/net_commons/net_commons/csrfToken.json', cache: false, success: function(data) {
- var url = NC3_URL;
- params = Object.assign({}, params);
- if (isLoad) {
- params._Token = params.load._Token;
- url += '/likes/likes/load.json';
- delete params.LikesUser;
- } else {
- params._Token = params.save._Token;
- url += '/likes/likes/save.json';
- }
- delete params.load;
- delete params.save;
-
- var token = data;
- params._Token.key = token.data._Token.key;
- $.ajax({
- url: url,
- method: 'POST',
- cache: false,
- data: $.param({data: params}),
- contentType: 'application/x-www-form-urlencoded',
- success: function(data) {
- deferred.resolve(data);
- },
- error: function(jqXHR) {
- deferred.reject(jqXHR.responseText, jqXHR.status);
+ $http.get(NC3_URL + '/net_commons/net_commons/csrfToken.json')
+ .then(function(response) {
+ var url = NC3_URL;
+ params = Object.assign({}, params);
+ if (isLoad) {
+ params._Token = params.load._Token;
+ url += '/likes/likes/load.json';
+ delete params.LikesUser;
+ } else {
+ params._Token = params.save._Token;
+ url += '/likes/likes/save.json';
}
+ delete params.load;
+ delete params.save;
+
+ var token = response.data;
+ params._Token.key = token.data._Token.key;
+
+ // POSTリクエスト
+ $http.post(
+ url,
+ $.param({_method: 'POST', data: params}),
+ {
+ cache: false,
+ headers: {'Content-Type': 'application/x-www-form-urlencoded'}
+ }
+ ).then(
+ function(response) {
+ // success condition
+ var data = response.data;
+ deferred.resolve(data);
+ },
+ function(response) {
+ // error condition
+ var data = response.data;
+ var status = response.status;
+ deferred.reject(data, status);
+ });
+ },
+ function(response) {
+ // Token error condition
+ var data = response.data;
+ var status = response.status;
+ deferred.reject(data, status);
});
- }, error: function(jqXHR) {
- deferred.reject(jqXHR.responseText, jqXHR.status);
- }
- });
promise.success = function(fn) {
promise.then(fn);
From e971d2b791329a4e7f55d7099fa50cbddad09d47 Mon Sep 17 00:00:00 2001
From: "Sakamoto, Kazunori"
Date: Mon, 2 Mar 2020 10:29:05 +0900
Subject: [PATCH 31/36] fix: show like counts if no record
---
Controller/LikesController.php | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/Controller/LikesController.php b/Controller/LikesController.php
index 8ba40b6..5e6110e 100644
--- a/Controller/LikesController.php
+++ b/Controller/LikesController.php
@@ -52,12 +52,20 @@ public function load() {
return $this->throwBadRequest();
}
+ $this->set('_serialize', array('disabled', 'likeCount', 'unlikeCount'));
+
$contentKey = $this->data['Like']['content_key'];
$like = $this->Like->find('first', array(
'recursive' => -1,
'fields' => array('id', 'like_count', 'unlike_count'),
'conditions' => array('content_key' => $contentKey)
));
+ if (!isset($like['Like'])) {
+ $this->set('disabled', 0);
+ $this->set('likeCount', 0);
+ $this->set('unlikeCount', 0);
+ return;
+ }
$likesUserConditions = array(
'like_id' => $like['Like']['id'],
@@ -76,7 +84,6 @@ public function load() {
$this->set('disabled', $likesUserCount);
$this->set('likeCount', (int)$like['Like']['like_count']);
$this->set('unlikeCount', (int)$like['Like']['unlike_count']);
- $this->set('_serialize', array('disabled', 'likeCount', 'unlikeCount'));
}
/**
From ae2c1d60140b1bc2d244338e0aefe71d9a79624f Mon Sep 17 00:00:00 2001
From: "Sakamoto, Kazunori"
Date: Thu, 19 Mar 2020 02:18:49 +0900
Subject: [PATCH 32/36] feat: update all like counts as well as csrf tokens
---
Controller/LikesController.php | 63 +++++-----
Model/LikesAppModel.php | 2 +-
Test/Case/Controller/LikesControllerTest.php | 4 +-
Test/Case/Model/Like/ExistsLikeTest.php | 4 +-
Test/Case/View/Helper/DisplayTest.php | 4 +-
View/Elements/like_button.ctp | 37 +++---
View/Helper/LikeHelper.php | 116 +++++++++++--------
webroot/js/likes.js | 103 +++++-----------
8 files changed, 160 insertions(+), 173 deletions(-)
diff --git a/Controller/LikesController.php b/Controller/LikesController.php
index 5e6110e..a0e2e68 100644
--- a/Controller/LikesController.php
+++ b/Controller/LikesController.php
@@ -4,7 +4,7 @@
*
* @author Noriko Arai
* @author Shohei Nakajima
- * @author Kazunori Sakamoto
+ * @author Kazunori Sakamoto
* @link http://www.netcommons.org NetCommons Project
* @license http://www.netcommons.org/license.txt NetCommons License
* @copyright Copyright 2014, NetCommons Project
@@ -16,7 +16,7 @@
* Likes Controller
*
* @author Shohei Nakajima
- * @author Kazunori Sakamoto
+ * @author Kazunori Sakamoto
* @package NetCommons\Likes\Controller
*/
class LikesController extends LikesAppController {
@@ -48,42 +48,45 @@ public function beforeFilter() {
* @return void
*/
public function load() {
- if (! $this->request->is('post')) {
- return $this->throwBadRequest();
- }
-
- $this->set('_serialize', array('disabled', 'likeCount', 'unlikeCount'));
+ $likes = [];
+ $condsStrs = explode(',', $this->request->query('like_conds_strs'));
- $contentKey = $this->data['Like']['content_key'];
- $like = $this->Like->find('first', array(
- 'recursive' => -1,
- 'fields' => array('id', 'like_count', 'unlike_count'),
- 'conditions' => array('content_key' => $contentKey)
- ));
- if (!isset($like['Like'])) {
- $this->set('disabled', 0);
- $this->set('likeCount', 0);
- $this->set('unlikeCount', 0);
- return;
- }
-
- $likesUserConditions = array(
- 'like_id' => $like['Like']['id'],
- );
+ $likesUserConditions = [];
if (Current::read('User.id')) {
$likesUserConditions['user_id'] = Current::read('User.id');
} else {
$likesUserConditions['session_key'] = $this->Session->id();
}
- $likesUserCount = $this->LikesUser->find('count', array(
- 'recursive' => -1,
- 'conditions' => $likesUserConditions
- ));
+ foreach ($condsStrs as $condsStr) {
+ $conds = explode('-', $condsStr);
+ $like = $this->Like->find('first', [
+ 'fields' => [
+ 'id',
+ 'like_count',
+ 'unlike_count',
+ ],
+ 'conditions' => [
+ 'plugin_key' => $conds[0],
+ 'block_key' => $conds[1],
+ 'content_key' => $conds[2],
+ ],
+ 'recursive' => -1,
+ ]);
+ if (! empty($like)) {
+ $like = $like['Like'];
+ $likesUserConditions['like_id'] = $like['id'];
+ $like['disabled'] = $this->LikesUser->find('count', [
+ 'conditions' => $likesUserConditions,
+ 'recursive' => -1,
+ ]);
+ unset($like['id']);
+ $likes[$condsStr] = $like;
+ }
+ }
- $this->set('disabled', $likesUserCount);
- $this->set('likeCount', (int)$like['Like']['like_count']);
- $this->set('unlikeCount', (int)$like['Like']['unlike_count']);
+ $this->set('likes', $likes);
+ $this->set('_serialize', ['likes']);
}
/**
diff --git a/Model/LikesAppModel.php b/Model/LikesAppModel.php
index d70be46..e55a6e7 100644
--- a/Model/LikesAppModel.php
+++ b/Model/LikesAppModel.php
@@ -4,7 +4,7 @@
*
* @author Noriko Arai
* @author Shohei Nakajima
- * @author Kazunori Sakamoto
+ * @author Kazunori Sakamoto
* @link http://www.netcommons.org NetCommons Project
* @license http://www.netcommons.org/license.txt NetCommons License
* @copyright Copyright 2014, NetCommons Project
diff --git a/Test/Case/Controller/LikesControllerTest.php b/Test/Case/Controller/LikesControllerTest.php
index e03dfed..159863c 100644
--- a/Test/Case/Controller/LikesControllerTest.php
+++ b/Test/Case/Controller/LikesControllerTest.php
@@ -4,7 +4,7 @@
*
* @author Noriko Arai
* @author Shohei Nakajima
- * @author Kazunori Sakamoto
+ * @author Kazunori Sakamoto
* @link http://www.netcommons.org NetCommons Project
* @license http://www.netcommons.org/license.txt NetCommons License
* @copyright Copyright 2014, NetCommons Project
@@ -16,7 +16,7 @@
* LikesController Test Case
*
* @author Shohei Nakajima
- * @author Kazunori Sakamoto
+ * @author Kazunori Sakamoto
* @package NetCommons\Likes\Test\Case\Controller
* @SuppressWarnings(PHPMD.LongVariable)
*/
diff --git a/Test/Case/Model/Like/ExistsLikeTest.php b/Test/Case/Model/Like/ExistsLikeTest.php
index f3705e8..4dde930 100644
--- a/Test/Case/Model/Like/ExistsLikeTest.php
+++ b/Test/Case/Model/Like/ExistsLikeTest.php
@@ -6,7 +6,7 @@
*
* @author Noriko Arai
* @author Shohei Nakajima
- * @author Kazunori Sakamoto
+ * @author Kazunori Sakamoto
* @link http://www.netcommons.org NetCommons Project
* @license http://www.netcommons.org/license.txt NetCommons License
* @copyright Copyright 2014, NetCommons Project
@@ -18,7 +18,7 @@
* Like::existsLike()のテスト
*
* @author Shohei Nakajima
- * @author Kazunori Sakamoto
+ * @author Kazunori Sakamoto
* @package NetCommons\Likes\Test\Case\Model\Like
*/
class LikeExistsLikeTest extends NetCommonsModelTestCase {
diff --git a/Test/Case/View/Helper/DisplayTest.php b/Test/Case/View/Helper/DisplayTest.php
index 5b67d22..3970143 100644
--- a/Test/Case/View/Helper/DisplayTest.php
+++ b/Test/Case/View/Helper/DisplayTest.php
@@ -4,6 +4,7 @@
*
* @author Noriko Arai
* @author Shohei Nakajima
+ * @author Kazunori Sakamoto
* @link http://www.netcommons.org NetCommons Project
* @license http://www.netcommons.org/license.txt NetCommons License
* @copyright Copyright 2014, NetCommons Project
@@ -17,6 +18,7 @@
* Display for LikeHelper Test Case
*
* @author Shohei Nakajima
+ * @author Kazunori Sakamoto
* @package NetCommons\Likes\Test\Case\View\Helper
*/
class LikeHelperDisplayTest extends NetCommonsCakeTestCase {
@@ -61,7 +63,7 @@ public function tearDown() {
* @return void
*/
public function testDisplay($setting, $content) {
- $result = $this->Like->display($setting, $content);
+ $result = $this->Like->display('Video', $setting, $content);
if ($setting['use_like'] === 1) {
$this->assertContains('glyphicon glyphicon-thumbs-up', $result);
diff --git a/View/Elements/like_button.ctp b/View/Elements/like_button.ctp
index 91171fb..09d70b8 100644
--- a/View/Elements/like_button.ctp
+++ b/View/Elements/like_button.ctp
@@ -3,26 +3,31 @@
* Like button view template
*
* @author Shohei Nakajima
+ * @author Kazunori Sakamoto
* @link http://www.netcommons.org NetCommons Project
* @license http://www.netcommons.org/license.txt NetCommons License
* @copyright Copyright 2014, NetCommons Project
*/
?>
-
-
- {{options.likeCount}}
-
- {{options.unlikeCount}}
-
-
-
-
-
- {{options.likeCount}}
-
- {{options.unlikeCount}}
-
+
+
+ ng-click="save(, )">
+
+
+
+
+
+
+
+
+ >
+
+
+
+
+
+
+
+
diff --git a/View/Helper/LikeHelper.php b/View/Helper/LikeHelper.php
index 28cab93..ef8e3c5 100644
--- a/View/Helper/LikeHelper.php
+++ b/View/Helper/LikeHelper.php
@@ -4,7 +4,7 @@
*
* @author Noriko Arai
* @author Shohei Nakajima
- * @author Kazunori Sakamoto
+ * @author Kazunori Sakamoto
* @link http://www.netcommons.org NetCommons Project
* @license http://www.netcommons.org/license.txt NetCommons License
* @copyright Copyright 2014, NetCommons Project
@@ -23,7 +23,7 @@ class_exists('Like');
* * イイネ！、ヤダネ！ボタン表示:[buttonsメソッド](#buttons)
*
* @author Shohei Nakajima
- * @author Kazunori Sakamoto
+ * @author Kazunori Sakamoto
* @package NetCommons\Likes\View\Helper
*/
class LikeHelper extends AppHelper {
@@ -33,13 +33,14 @@ class LikeHelper extends AppHelper {
*
* @var array
*/
- public $helpers = array(
+ public $helpers = [
'Html',
'Form',
+ 'NetCommons.CDNCache',
'NetCommons.NetCommonsForm',
'NetCommons.NetCommonsHtml',
'NetCommons.Token',
- );
+ ];
/**
* Before render callback. beforeRender is called before the view file is rendered.
@@ -140,33 +141,43 @@ public function setting($likeFieldName, $unlikeFieldName, $attributes = array())
* #### Sample code
* ##### template file(ctp file)
* ```
- * Like->display($bbsSetting, $bbsArticle); ?>
+ * Like->display('BbsArticle', $bbsSetting, $bbsArticle); ?>
* ```
*
+ * @param array $model String of model name
* @param array $setting Array of use like setting data.
* @param array $content Array of content data with like count.
* @param array $attributes Array of attributes and HTML arguments.
* @return string HTML tags
*/
- public function display($setting, $content, $attributes = array()) {
+ public function display($model, $setting, $content, $attributes = array()) {
$output = '';
+ $condsStr = $this->_View->request->params['plugin'] . '-'
+ . Current::read('Block.key') . '-' . $content[$model]['key'];
+
+ $like = $this->__getInitialLike($content);
+
//いいね
if (isset($setting['use_like']) && $setting['use_like']) {
- $element = ' ';
- $element .= (int)Hash::get($content, 'Like.like_count');
+ $element = '';
+ $element .= ' ';
+ $element .= '' . $like['like_count'] . '';
+ $element .= '';
$output .= $this->Html->div(
- array('like-icon', 'text-muted'), $element, $attributes
- );
+ array('like-icon', 'text-muted'), $element, $attributes
+ );
}
//わるいね
if (isset($setting['use_unlike']) && $setting['use_unlike']) {
- $element = ' ';
- $element .= (int)Hash::get($content, 'Like.unlike_count');
+ $element = '';
+ $element .= ' ';
+ $element .= '' . $like['unlike_count'] . '';
+ $element .= '';
$output .= $this->Html->div(
- array('like-icon', 'text-muted'), $element, $attributes
- );
+ array('like-icon', 'text-muted'), $element, $attributes
+ );
}
return $output;
@@ -195,12 +206,12 @@ public function display($setting, $content, $attributes = array()) {
public function buttons($model, $setting, $content, $attributes = array()) {
$output = '';
- if (! Hash::get($setting, 'use_like') && ! Hash::get($setting, 'use_like')) {
+ if (! Hash::get($setting, 'use_like') && ! Hash::get($setting, 'use_unlike')) {
return $output;
}
if ($content[$model]['status'] !== WorkflowComponent::STATUS_PUBLISHED) {
- return $this->display($setting, $content, $attributes);
+ return $this->display($model, $setting, $content, $attributes);
}
if (! isset($content['Like']['id'])) {
@@ -218,65 +229,51 @@ public function buttons($model, $setting, $content, $attributes = array()) {
);
}
- $currentData = $this->_View->request->data;
-
- $data = array(
- 'Frame' => array('id' => Current::read('Frame.id')),
- 'Like' => array(
+ $data = [
+ 'Frame' => ['id' => Current::read('Frame.id')],
+ 'Like' => [
'plugin_key' => Hash::get($content, 'Like.plugin_key'),
'block_key' => Hash::get($content, 'Like.block_key'),
'content_key' => Hash::get($content, 'Like.content_key'),
- ),
- );
-
- $tokenFields = Hash::flatten($data);
- $hiddenFields = array_keys($tokenFields);
-
- $this->_View->request->data = $data;
- $loadToken = $this->Token->getToken('LikeLoad', '/likes/likes/load.json', $tokenFields, $hiddenFields);
-
- $data += array(
- 'LikesUser' => array(
+ ],
+ 'LikesUser' => [
'like_id' => Hash::get($content, 'LikesUser.like_id'),
'user_id' => Hash::get($content, 'LikesUser.user_id'),
'is_liked' => Hash::get($content, 'LikesUser.is_liked'),
- ),
- );
+ ],
+ ];
$tokenFields = Hash::flatten($data);
$hiddenFields = $tokenFields;
unset($hiddenFields['LikesUser.is_liked']);
$hiddenFields = array_keys($hiddenFields);
+ $currentData = $this->_View->request->data;
$this->_View->request->data = $data;
- $saveToken = $this->Token->getToken('LikeSave', '/likes/likes/save.json', $tokenFields, $hiddenFields);
+
+ $token = $this->Token->getToken('LikeSave', '/likes/likes/save.json', $tokenFields, $hiddenFields);
+ $data += $token;
$this->_View->request->data = $currentData;
- $data += array(
- 'load' => $loadToken,
- 'save' => $saveToken
- );
+ $like = $content['Like'];
+ $condsStr = $like['plugin_key'] . '-' . $like['block_key'] . '-' . $like['content_key'];
- $options = array(
- 'likeCount' => '-',
- 'unlikeCount' => '-',
- 'disabled' => true
- );
+ $like = $this->__getInitialLike($content);
$output .= '';
+ 'ng-init="initialize(' . h(json_encode($data)) . ')">';
//いいね
if (Hash::get($setting, 'use_like')) {
- $output .= $this->Html->div(array('like-icon'),
- $this->_View->element('Likes.like_button', ['isLiked' => Like::IS_LIKE]), $attributes);
+ $output .= $this->Html->div(array('like-icon'), $this->_View->element('Likes.like_button',
+ ['condsStr' => $condsStr, 'like' => $like, 'isLiked' => Like::IS_LIKE]), $attributes);
}
//わるいね
if (Hash::get($setting, 'use_unlike')) {
- $output .= $this->Html->div(array('like-icon'),
- $this->_View->element('Likes.like_button', ['isLiked' => Like::IS_UNLIKE]), $attributes);
+ $output .= $this->Html->div(array('like-icon'), $this->_View->element('Likes.like_button',
+ ['condsStr' => $condsStr, 'like' => $like, 'isLiked' => Like::IS_UNLIKE]), $attributes);
}
$output .= '
';
@@ -284,4 +281,25 @@ public function buttons($model, $setting, $content, $attributes = array()) {
return $output;
}
+/**
+ * Ajaxの実行前に表示すべきいいね情報を返します。
+ *
+ * @param array $content Array of content data with like count.
+ * @return array
+ */
+ private function __getInitialLike($content) {
+ if ($this->CDNCache->isCacheable()) {
+ return [
+ 'like_count' => '-',
+ 'unlike_count' => '-',
+ 'disabled' => true,
+ ];
+ }
+ $like = $content['Like'];
+ return [
+ 'like_count' => Hash::get($like, 'like_count', 0),
+ 'unlike_count' => Hash::get($like, 'unlike_count', 0),
+ 'disabled' => $content['LikesUser']['is_liked'],
+ ];
+ }
}
diff --git a/webroot/js/likes.js b/webroot/js/likes.js
index ba6ffce..209e5bb 100644
--- a/webroot/js/likes.js
+++ b/webroot/js/likes.js
@@ -1,55 +1,30 @@
/**
* @fileoverview Likes Javascript
* @author nakajimashouhei@gmail.com (Shohei Nakajima)
- * @author exkazuu@gmail.com (Kazunori Sakamoto)
+ * @author exkazuu@willbooster.com (Kazunori Sakamoto)
*/
-(function() {
- /**
- * Likes Service Javascript
- *
- * @param {string} Controller name
- * @param {function('$http', '$q')} Controller
- */
- NetCommonsApp.factory('LikesLoad', ['$http', '$q', 'NC3_URL', function($http, $q, NC3_URL) {
- return function(data) {
- return request($http, $q, NC3_URL, data, true);
- };
- }]);
-
- NetCommonsApp.factory('LikesSave', ['$http', '$q', 'NC3_URL', function($http, $q, NC3_URL) {
- return function(data) {
- return request($http, $q, NC3_URL, data, false);
- };
- }]);
-
- function request($http, $q, NC3_URL, params, isLoad) {
+/**
+ * Likes Service Javascript
+ *
+ * @param {string} Controller name
+ * @param {function('$http', '$q')} Controller
+ */
+NetCommonsApp.factory('LikesSave', ['$http', '$q', 'NC3_URL', function($http, $q, NC3_URL) {
+ return function(data) {
var deferred = $q.defer();
var promise = deferred.promise;
$http.get(NC3_URL + '/net_commons/net_commons/csrfToken.json')
.then(function(response) {
- var url = NC3_URL;
- params = Object.assign({}, params);
- if (isLoad) {
- params._Token = params.load._Token;
- url += '/likes/likes/load.json';
- delete params.LikesUser;
- } else {
- params._Token = params.save._Token;
- url += '/likes/likes/save.json';
- }
- delete params.load;
- delete params.save;
-
var token = response.data;
- params._Token.key = token.data._Token.key;
+ data._Token.key = token.data._Token.key;
// POSTリクエスト
$http.post(
- url,
- $.param({_method: 'POST', data: params}),
+ NC3_URL + '/likes/likes/save.json',
+ $.param({_method: 'POST', data: data}),
{
cache: false,
headers: {'Content-Type': 'application/x-www-form-urlencoded'}
@@ -85,16 +60,16 @@
};
return promise;
- }
-})();
+ };
+}]);
/**
* Likes Controller Javascript
*
* @param {string} Controller name
- * @param {function($scope, LikesLoad, LikesSave)} Controller
+ * @param {function($scope, LikesSave)} Controller
*/
-NetCommonsApp.controller('Likes', ['$scope', 'LikesLoad', 'LikesSave', function($scope, LikesLoad, LikesSave) {
+NetCommonsApp.controller('Likes', ['$scope', 'LikesSave', function($scope, LikesSave) {
/**
* Request parameters
@@ -103,16 +78,6 @@ NetCommonsApp.controller('Likes', ['$scope', 'LikesLoad', 'LikesSave', function(
*/
$scope.data = null;
- /**
- * Options parameters
- * - disabled
- * - likeCounts
- * - unlikeCounts
- *
- * @type {object}
- */
- $scope.options = null;
-
/**
* initialize
* - disabled
@@ -121,17 +86,8 @@ NetCommonsApp.controller('Likes', ['$scope', 'LikesLoad', 'LikesSave', function(
*
* @return {void}
*/
- $scope.initialize = function(data, options) {
+ $scope.initialize = function(data) {
$scope.data = data;
- $scope.options = options;
- $scope.options.disabled = true;
-
- LikesLoad($scope.data)
- .success(function(data) {
- $scope.options.disabled = data.disabled;
- $scope.options.likeCount = data.likeCount;
- $scope.options.unlikeCount = data.unlikeCount;
- });
};
/**
@@ -139,25 +95,28 @@ NetCommonsApp.controller('Likes', ['$scope', 'LikesLoad', 'LikesSave', function(
*
* @return {void}
*/
- $scope.save = function(isLiked) {
- $scope.data.LikesUser.is_liked = isLiked;
- if ($scope.options.disabled) {
- return;
- }
- $scope.options.disabled = true;
- $scope.sending = true;
+ $scope.save = function(isLiked, condsStr) {
+ var queryPrefix = '.' + condsStr;
+ var aDisplay = $(queryPrefix + ' > a').css('display');
+ var spanDisplay = $(queryPrefix + ' > span').css('display');
+
+ $(queryPrefix + ' > a').css('display', 'none');
+ $(queryPrefix + ' > span').css('display', '');
+ $scope.data.LikesUser.is_liked = isLiked;
LikesSave($scope.data)
.success(function() {
- $scope.sending = false;
+ var $counts;
if (isLiked) {
- $scope.options.likeCount += 1;
+ $counts = $(queryPrefix + ' .like-count');
} else {
- $scope.options.unlikeCount += 1;
+ $counts = $(queryPrefix + ' .unlike-count');
}
+ $counts.each(function() { $(this).text(Number($(this).text()) + 1); });
})
.error(function() {
- $scope.sending = false;
+ $(queryPrefix + ' > a').css('display', aDisplay);
+ $(queryPrefix + ' > span').css('display', spanDisplay);
});
};
}]);
From 7ad7eb2730f1ae69cce055a493c49717792b0798 Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Fri, 7 Aug 2020 22:14:55 +0900
Subject: [PATCH 33/36] =?UTF-8?q?change:=20test:=20Travis=E3=81=8B?=
=?UTF-8?q?=E3=82=89PHP5.6=E3=82=92=E5=89=8A=E9=99=A4,php72=E4=BB=A5?=
=?UTF-8?q?=E9=99=8D=E3=81=A7UnitTest=E3=81=A7Warning=E3=81=8C=E5=87=BA?=
=?UTF-8?q?=E3=82=8B=E3=81=9F=E3=82=81=E4=BF=AE=E6=AD=A3=20https://github.?=
=?UTF-8?q?com/NetCommons3/NetCommons3/issues/1588?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index e8efde3..1736933 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ dist: trusty
env:
matrix:
- - NETCOMMONS_VERSION=master DB=mysql
+ - NETCOMMONS_VERSION=availability DB=mysql
global:
- secure: "eOJhJHrLG6nQUX222m/g/g1LR+k/W/mtdvJsxyHRx++Robu6EIDuXmE6Y4SuIi0vlvJbdhrOx9Gu0oKIkX5RYXbY0iwFnoQ1iXYnPBH9DoBp7ucr2ddd/UDsIkR40k6v8m2Dunzzk1xfiZvXw0UUxL/ulMQLBqvjEZu+pgLM9sc="
- GIT_COMMITTER_NAME=s-nakajima
From 820021a4a3a7978eac3141b0308cf60cfd842aa5 Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Sat, 8 Aug 2020 15:30:23 +0900
Subject: [PATCH 34/36] =?UTF-8?q?change:=20test:=20phpunit,=20phpcs,=20gjs?=
=?UTF-8?q?lint=E4=BF=AE=E6=AD=A3=20https://github.com/NetCommons3/NetComm?=
=?UTF-8?q?ons3/issues/1588?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Model/LikesAppModel.php | 8 +++-
Test/Case/View/Helper/ButtonsTest.php | 10 ++---
View/Elements/like_button.ctp | 2 +-
View/Helper/LikeHelper.php | 8 ++--
webroot/js/likes.js | 63 ++++++++++++++-------------
5 files changed, 50 insertions(+), 41 deletions(-)
diff --git a/Model/LikesAppModel.php b/Model/LikesAppModel.php
index e55a6e7..93ab7c8 100644
--- a/Model/LikesAppModel.php
+++ b/Model/LikesAppModel.php
@@ -19,5 +19,11 @@
* @package NetCommons\Likes\Model
*/
class LikesAppModel extends AppModel {
- public $invalidateCDN = false;
+
+/**
+ * CDNを無効にする
+ *
+ * @var bool
+ */
+ public $invalidateCDN = false;
}
diff --git a/Test/Case/View/Helper/ButtonsTest.php b/Test/Case/View/Helper/ButtonsTest.php
index 837c65b..baf1f6e 100644
--- a/Test/Case/View/Helper/ButtonsTest.php
+++ b/Test/Case/View/Helper/ButtonsTest.php
@@ -65,11 +65,11 @@ public function tearDown() {
public function testButtons($model, $setting, $content) {
$result = $this->Like->buttons('Content', $setting, $content);
- if ($content['Content']['status'] === WorkflowComponent::STATUS_PUBLISHED && $setting['use_like'] === 1) {
- $this->assertContains('assertNotContains('assertContains('assertNotContains('assertContains('glyphicon glyphicon-thumbs-up', $result);
} else {
diff --git a/View/Elements/like_button.ctp b/View/Elements/like_button.ctp
index 09d70b8..ba3b013 100644
--- a/View/Elements/like_button.ctp
+++ b/View/Elements/like_button.ctp
@@ -12,7 +12,7 @@
- ng-click="save(, )">
+ ng-click="save()">
diff --git a/View/Helper/LikeHelper.php b/View/Helper/LikeHelper.php
index ef8e3c5..5853987 100644
--- a/View/Helper/LikeHelper.php
+++ b/View/Helper/LikeHelper.php
@@ -153,8 +153,8 @@ public function setting($likeFieldName, $unlikeFieldName, $attributes = array())
public function display($model, $setting, $content, $attributes = array()) {
$output = '';
- $condsStr = $this->_View->request->params['plugin'] . '-'
- . Current::read('Block.key') . '-' . $content[$model]['key'];
+ $condsStr = $this->_View->request->params['plugin'] . '-' .
+ Current::read('Block.key') . '-' . $content[$model]['key'];
$like = $this->__getInitialLike($content);
@@ -251,7 +251,9 @@ public function buttons($model, $setting, $content, $attributes = array()) {
$currentData = $this->_View->request->data;
$this->_View->request->data = $data;
- $token = $this->Token->getToken('LikeSave', '/likes/likes/save.json', $tokenFields, $hiddenFields);
+ $token = $this->Token->getToken(
+ 'LikeSave', '/likes/likes/save.json', $tokenFields, $hiddenFields
+ );
$data += $token;
$this->_View->request->data = $currentData;
diff --git a/webroot/js/likes.js b/webroot/js/likes.js
index 209e5bb..f896df6 100644
--- a/webroot/js/likes.js
+++ b/webroot/js/likes.js
@@ -17,30 +17,30 @@ NetCommonsApp.factory('LikesSave', ['$http', '$q', 'NC3_URL', function($http, $q
var promise = deferred.promise;
$http.get(NC3_URL + '/net_commons/net_commons/csrfToken.json')
- .then(function(response) {
+ .then(function(response) {
var token = response.data;
data._Token.key = token.data._Token.key;
// POSTリクエスト
$http.post(
- NC3_URL + '/likes/likes/save.json',
- $.param({_method: 'POST', data: data}),
- {
- cache: false,
- headers: {'Content-Type': 'application/x-www-form-urlencoded'}
- }
+ NC3_URL + '/likes/likes/save.json',
+ $.param({_method: 'POST', data: data}),
+ {
+ cache: false,
+ headers: {'Content-Type': 'application/x-www-form-urlencoded'}
+ }
).then(
- function(response) {
- // success condition
- var data = response.data;
- deferred.resolve(data);
- },
- function(response) {
- // error condition
- var data = response.data;
- var status = response.status;
- deferred.reject(data, status);
- });
+ function(response) {
+ // success condition
+ var data = response.data;
+ deferred.resolve(data);
+ },
+ function(response) {
+ // error condition
+ var data = response.data;
+ var status = response.status;
+ deferred.reject(data, status);
+ });
},
function(response) {
// Token error condition
@@ -63,6 +63,7 @@ NetCommonsApp.factory('LikesSave', ['$http', '$q', 'NC3_URL', function($http, $q
};
}]);
+
/**
* Likes Controller Javascript
*
@@ -105,19 +106,19 @@ NetCommonsApp.controller('Likes', ['$scope', 'LikesSave', function($scope, Likes
$scope.data.LikesUser.is_liked = isLiked;
LikesSave($scope.data)
- .success(function() {
- var $counts;
- if (isLiked) {
- $counts = $(queryPrefix + ' .like-count');
- } else {
- $counts = $(queryPrefix + ' .unlike-count');
- }
- $counts.each(function() { $(this).text(Number($(this).text()) + 1); });
- })
- .error(function() {
- $(queryPrefix + ' > a').css('display', aDisplay);
- $(queryPrefix + ' > span').css('display', spanDisplay);
- });
+ .success(function() {
+ var $counts;
+ if (isLiked) {
+ $counts = $(queryPrefix + ' .like-count');
+ } else {
+ $counts = $(queryPrefix + ' .unlike-count');
+ }
+ $counts.each(function() { $(this).text(Number($(this).text()) + 1); });
+ })
+ .error(function() {
+ $(queryPrefix + ' > a').css('display', aDisplay);
+ $(queryPrefix + ' > span').css('display', spanDisplay);
+ });
};
}]);
From 42160a26f775f13dddf25bb9c426ad1a99b72307 Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Sat, 23 Apr 2022 09:18:33 +0900
Subject: [PATCH 35/36] =?UTF-8?q?test:=20github=20actions=E3=81=AE?=
=?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.github/workflows/tests.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9501566..d6b4be4 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -38,7 +38,7 @@ jobs:
NC3_BUILD_DIR: "/opt/nc3"
NC3_DOCKER_DIR: "/opt/docker"
NC3_GIT_URL: "git://github.com/NetCommons3/NetCommons3.git"
- NC3_GIT_BRANCH: "master"
+ NC3_GIT_BRANCH: "availability"
PLUGIN_BUILD_DIR: ${{ github.workspace }}
PHP_VERSION: ${{ matrix.php }}
MYSQL_VERSION: ${{ matrix.mysql }}
From eacfddd9b6758949de1981edbd5465219676cc89 Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Sat, 23 Apr 2022 12:32:15 +0900
Subject: [PATCH 36/36] =?UTF-8?q?fix:=20Notice=E3=81=8C=E7=99=BA=E7=94=9F?=
=?UTF-8?q?=E3=81=99=E3=82=8B=E5=8F=AF=E8=83=BD=E6=80=A7=E3=81=8C=E3=81=82?=
=?UTF-8?q?=E3=82=8B=E3=81=9F=E3=82=81=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
View/Helper/LikeHelper.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/View/Helper/LikeHelper.php b/View/Helper/LikeHelper.php
index 5853987..e27f8af 100644
--- a/View/Helper/LikeHelper.php
+++ b/View/Helper/LikeHelper.php
@@ -154,7 +154,7 @@ public function display($model, $setting, $content, $attributes = array()) {
$output = '';
$condsStr = $this->_View->request->params['plugin'] . '-' .
- Current::read('Block.key') . '-' . $content[$model]['key'];
+ Current::read('Block.key') . '-' . ($content[$model]['key'] ?? '');
$like = $this->__getInitialLike($content);