Skip to content

ConcreteCMS v9 compatibility updates #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aohlrogge wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ConcreteCMS v9 compatibility updates #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4842c4
updates to work with v9
Aug 10, 2022
0389f38
removing console log
Aug 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Multiple user selector attribute type

Requirements:
- concrete5 8+
- PHP 5.6+
- concrete5 9+
- PHP 7.4+
51 changes: 27 additions & 24 deletions attributes/multi_user_selector/controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

use Concrete\Core\Attribute\Controller as CoreController;
use Concrete\Core\Support\Facade\UserInfo;
use Database;
use Core;

class controller extends CoreController
{
Expand All @@ -19,7 +17,7 @@ public function getRawValue()
return null;
}

$db = Database::connection();
$db = $this->app->make('database')->connection();
$value = $db->fetchColumn("SELECT value FROM atMultiUserSelector WHERE avID = ?", [
$this->attributeValue->getAttributeValueID(),
]);
Expand Down Expand Up @@ -91,7 +89,7 @@ public function searchForm($list)
{
$value = $this->request($this->field('value'));
$values = explode(',', $value);
$db = Database::get();
$db = $this->app->make('database')->connection();
$tbl = $this->attributeKey->getIndexedSearchTable();

$i = 0;
Expand Down Expand Up @@ -136,7 +134,7 @@ public function saveValue($value)
return;
}

$db = Database::connection();
$db = $this->app->make('database')->connection();

if (is_array($value)) {
$value = implode(',', $value);
Expand All @@ -154,13 +152,12 @@ public function saveValue($value)

public function saveKey($data)
{
$db = Database::connection();
$ak = $this->getAttributeKey();
}

public function deleteKey()
{
$db = Database::connection();
$db = $this->app->make('database')->connection();
foreach ($this->attributeKey->getAttributeValueIDList() as $id) {
$db->query("DELETE FROM atMultiUserSelector WHERE avID = ?", [
$id
Expand All @@ -170,7 +167,8 @@ public function deleteKey()

public function saveForm($data)
{
$this->saveValue($data['value']);
$value = isset($data['value']) ? $data['value'] : [];
$this->saveValue($value);
}

public function deleteValue()
Expand All @@ -179,7 +177,7 @@ public function deleteValue()
return null;
}

$db = Database::connection();
$db = $this->app->make('database')->connection();
$db->query("DELETE FROM atMultiUserSelector where avID = ?", [
$this->getAttributeValueID()
]);
Expand Down Expand Up @@ -214,25 +212,30 @@ public function selectMultipleUsers($fieldName, $users = [])
});

$("#ccmUserSelect' . $id . ' .ccm-user-select-item").on(\'click\', function() {
ConcreteEvent.subscribe(\'UserSearchDialogSelectUser\', function(e, data) {
var uID = data.uID, uName = data.uName, uEmail = data.uEmail;
e.stopPropagation();
$("tr.ccm-user-selected-item-none").hide();
if ($("#ccmUserSelect' . $id . '_" + uID).length < 1) {
var html = "";
html += "<tr id=\"ccmUserSelect' . $id . '_" + uID + "\" class=\"ccm-list-record\"><td><input type=\"hidden\" name=\"' . $fieldName . '[]\" value=\"" + uID + "\" />" + uName + "</td>";
html += "<td>" + uEmail + "</td>";
html += "<td><a href=\"javascript:void(0)\" class=\"ccm-user-list-clear icon-link\"><i class=\"fa fa-minus-circle ccm-user-list-clear-button\" /></a>";
html += "</tr>";
$("#ccmUserSelect' . $id . '_body").append(html);
}
ConcreteEvent.subscribe(\'UserSearchDialogSelectUser.core\', function(e, data) {
jQuery.fn.dialog.closeTop();
ConcreteEvent.unbind(e);

if (data.users) {
data.users.forEach(function(user) {
var uID = user.id, uName = user.name, uEmail = user.email;
e.stopPropagation();
$("tr.ccm-user-selected-item-none").hide();
if ($("#ccmUserSelect' . $id . '_" + uID).length < 1) {
var html = "";
html += "<tr id=\"ccmUserSelect' . $id . '_" + uID + "\" class=\"ccm-list-record\"><td><input type=\"hidden\" name=\"' . $fieldName . '[]\" value=\"" + uID + "\" />" + uName + "</td>";
html += "<td>" + uEmail + "</td>";
html += "<td><a href=\"javascript:void(0)\" class=\"ccm-user-list-clear icon-link\"><i class=\"fa fa-minus-circle ccm-user-list-clear-button\" /></a>";
html += "</tr>";
$("#ccmUserSelect' . $id . '_body").append(html);
}
});
}

$("a.ccm-user-list-clear").click(function() {
$(this).parents(\'tr\').remove();
});
});
ConcreteEvent.subscribe(\'UserSearchDialogAfterSelectUser\', function(e) {
jQuery.fn.dialog.closeTop();
});
});
});

Expand Down
4 changes: 2 additions & 2 deletions controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
class controller extends Package
{
protected $pkgHandle = 'multi_user_selector_attribute';
protected $appVersionRequired = '8.0';
protected $pkgVersion = '0.9.1';
protected $appVersionRequired = '9.0';
protected $pkgVersion = '2.0.0';

public function getPackageName()
{
Expand Down