public/admc
1
0
Fork 0
mirror of https://github.com/altlinux/admc.git synced 2025-02-12 13:57:27 +03:00
Code Issues Projects Releases Wiki Activity

move attribute model editing into AttributesModel

Browse Source 
remove this->'es
This commit is contained in:
Dmitry Degtyarev 2020-05-27 17:38:46 +04:00
parent c37b63b563
commit 1a350089a3
6 changed files with 56 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/ad_model.cpp
View File

@ -56,7 +56,7 @@ bool AdModel::dropMimeData(const QMimeData *data, Qt::DropAction, int row, int c
if (row == -1 && column == -1) {
drop_index = parent;
} else {
drop_index = this->index(row, column, parent);
drop_index = index(row, column, parent);
}
// TODO: if parent is group and dropped entry is user do
@ -178,13 +178,13 @@ void load_and_add_row(QStandardItem *parent, const QString &dn) {
AdModel::AdModel(QObject *parent)
: QStandardItemModel(0, Column::COUNT, parent)
{
this->setHorizontalHeaderItem(Column::Name, new QStandardItem("Name"));
this->setHorizontalHeaderItem(Column::Category, new QStandardItem("Category"));
this->setHorizontalHeaderItem(Column::Description, new QStandardItem("Description"));
this->setHorizontalHeaderItem(Column::DN, new QStandardItem("DN"));
setHorizontalHeaderItem(Column::Name, new QStandardItem("Name"));
setHorizontalHeaderItem(Column::Category, new QStandardItem("Category"));
setHorizontalHeaderItem(Column::Description, new QStandardItem("Description"));
setHorizontalHeaderItem(Column::DN, new QStandardItem("DN"));
// Load head
QStandardItem *invis_root = this->invisibleRootItem();
QStandardItem *invis_root = invisibleRootItem();
auto head_dn = QString(HEAD_DN);
load_and_add_row(invis_root, head_dn);
@ -213,13 +213,13 @@ bool AdModel::canFetchMore(const QModelIndex &parent) const {
}
void AdModel::fetchMore(const QModelIndex &parent) {
if (!parent.isValid() || !this->canFetchMore(parent)) {
if (!parent.isValid() || !canFetchMore(parent)) {
return;
}
QString dn = get_dn_of_index(parent);
QStandardItem *parent_item = this->itemFromIndex(parent);
QStandardItem *parent_item = itemFromIndex(parent);
// Add children
QList<QString> children = load_children(dn);
@ -235,7 +235,7 @@ void AdModel::fetchMore(const QModelIndex &parent) {
// Override this so that unexpanded and unfetched items show the expander even though they technically don't have any children loaded
// NOTE: expander is show if hasChildren returns true
bool AdModel::hasChildren(const QModelIndex &parent = QModelIndex()) const {
if (this->canFetchMore(parent)) {
if (canFetchMore(parent)) {
return true;
} else {
return QStandardItemModel::hasChildren(parent);
@ -244,7 +244,7 @@ bool AdModel::hasChildren(const QModelIndex &parent = QModelIndex()) const {
void AdModel::on_entry_changed(const QString &dn) {
// TODO: confirm what kind of search is this, linear?
QList<QStandardItem *> items = this->findItems(dn, Qt::MatchExactly | Qt::MatchRecursive, AdModel::Column::DN);
QList<QStandardItem *> items = findItems(dn, Qt::MatchExactly | Qt::MatchRecursive, AdModel::Column::DN);
// TODO: not sure if any bad matches can happen, maybe?
if (items.size() > 0) {
@ -262,7 +262,7 @@ void AdModel::on_entry_changed(const QString &dn) {
auto row = QList<QStandardItem *>();
for (int i = 0; i < AdModel::Column::COUNT; i++) {
QModelIndex index = indexes[i];
QStandardItem *item = this->itemFromIndex(index);
QStandardItem *item = itemFromIndex(index);
row.push_back(item);
}
@ -272,24 +272,24 @@ void AdModel::on_entry_changed(const QString &dn) {
}
void AdModel::on_entry_deleted(const QString &dn) {
QList<QStandardItem *> items = this->findItems(dn, Qt::MatchExactly | Qt::MatchRecursive, AdModel::Column::DN);
QList<QStandardItem *> items = findItems(dn, Qt::MatchExactly | Qt::MatchRecursive, AdModel::Column::DN);
if (items.size() > 0) {
QStandardItem *dn_item = items[0];
QModelIndex dn_index = dn_item->index();
this->removeRow(dn_index.row(), dn_index.parent());
removeRow(dn_index.row(), dn_index.parent());
}
}
void AdModel::on_user_moved(const QString &old_dn, const QString &new_dn, const QString &new_parent_dn) {
// Remove old entry from model
QList<QStandardItem *> old_items = this->findItems(old_dn, Qt::MatchExactly | Qt::MatchRecursive, AdModel::Column::DN);
QList<QStandardItem *> old_items = findItems(old_dn, Qt::MatchExactly | Qt::MatchRecursive, AdModel::Column::DN);
if (old_items.size() > 0) {
QStandardItem *dn_item = old_items[0];
QModelIndex dn_index = dn_item->index();
this->removeRow(dn_index.row(), dn_index.parent());
removeRow(dn_index.row(), dn_index.parent());
}
printf("on_user_moved: %s %s\n", qPrintable(new_dn), qPrintable(new_parent_dn));
@ -298,15 +298,15 @@ void AdModel::on_user_moved(const QString &old_dn, const QString &new_dn, const
// been expanded/fetched
// NOTE: loading if parent has already been fetched will
// create a duplicate
QList<QStandardItem *> parent_items = this->findItems(new_parent_dn, Qt::MatchExactly | Qt::MatchRecursive, AdModel::Column::DN);
QList<QStandardItem *> parent_items = findItems(new_parent_dn, Qt::MatchExactly | Qt::MatchRecursive, AdModel::Column::DN);
if (parent_items.size() > 0) {
QStandardItem *parent_dn_item = parent_items[0];
QModelIndex parent_dn_index = parent_dn_item->index();
QModelIndex parent_index = parent_dn_index.siblingAtColumn(Column::Name);
QStandardItem *parent_item = this->itemFromIndex(parent_index);
QStandardItem *parent_item = itemFromIndex(parent_index);
if (!this->canFetchMore(parent_index)) {
if (!canFetchMore(parent_index)) {
load_and_add_row(parent_item, new_dn);
}
}
@ -316,15 +316,15 @@ void AdModel::on_entry_created(const QString &dn) {
// Load entry to model if it's parent has already been fetched
// If it hasn't been fetched, then this new entry will be loaded with all other children when the parent is fetched
QString parent_dn = extract_parent_dn_from_dn(dn);
QList<QStandardItem *> items = this->findItems(parent_dn, Qt::MatchExactly | Qt::MatchRecursive, Column::DN);
QList<QStandardItem *> items = findItems(parent_dn, Qt::MatchExactly | Qt::MatchRecursive, Column::DN);
if (items.size() > 0) {
QStandardItem *dn_item = items[0];
QModelIndex dn_index = dn_item->index();
QModelIndex parent_index = dn_index.siblingAtColumn(0);
QStandardItem *parent = this->itemFromIndex(parent_index);
QStandardItem *parent = itemFromIndex(parent_index);
bool fetched_already = !this->canFetchMore(parent_index);
bool fetched_already = !canFetchMore(parent_index);
if (fetched_already) {
load_and_add_row(parent, dn);
}

6
src/ad_proxy_model.cpp
View File

@ -6,13 +6,13 @@
AdProxyModel::AdProxyModel(AdModel *model, QObject *parent)
: QSortFilterProxyModel(parent)
{
this->setSourceModel(model);
setSourceModel(model);
}
void AdProxyModel::on_advanced_view_toggled(bool checked) {
// On advanced view toggle, copy advanced view flag and invalidate filter
advanced_view = checked;
this->invalidateFilter();
invalidateFilter();
}
bool AdProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const {
@ -20,7 +20,7 @@ bool AdProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_pa
// Hide advanced view only entries if advanced view is OFF
const bool advanced_view_only = index.data(AdModel::Roles::AdvancedViewOnly).toBool();
if (advanced_view_only && !this->advanced_view) {
if (advanced_view_only && !advanced_view) {
return false;
}

33
src/attributes_model.cpp
View File

@ -18,12 +18,11 @@ bool AttributesModel::setData(const QModelIndex &index, const QVariant &value, i
QModelIndex value_index = index;
QModelIndex name_index = value_index.siblingAtColumn(AttributesModel::Column::Name);
const QString dn = this->target_dn;
const QString attribute = name_index.data().toString();
const QString value_str = value.toString();
// printf("setData: %s, %s, %s\n", qPrintable(dn), qPrintable(attribute), qPrintable(value_str));
// printf("setData: %s, %s, %s\n", qPrintable(target_dn), qPrintable(attribute), qPrintable(value_str));
bool success = set_attribute(dn, attribute, value_str);
bool success = set_attribute(target_dn, attribute, value_str);
if (success) {
QStandardItemModel::setData(index, value, role);
@ -35,18 +34,34 @@ bool AttributesModel::setData(const QModelIndex &index, const QVariant &value, i
}
void AttributesModel::change_target(const QString &new_target_dn) {
this->target_dn = new_target_dn;
target_dn = new_target_dn;
// Clear old data
clear();
// NOTE: need to reset headers after clearing
this->clear();
this->setHorizontalHeaderItem(Column::Name, new QStandardItem("Name"));
this->setHorizontalHeaderItem(Column::Value, new QStandardItem("Value"));
setHorizontalHeaderItem(Column::Name, new QStandardItem("Name"));
setHorizontalHeaderItem(Column::Value, new QStandardItem("Value"));
// Populate model with attributes of new root
QMap<QString, QList<QString>> attributes = get_attributes(target_dn);
for (auto attribute : attributes.keys()) {
QList<QString> values = attributes[attribute];
for (auto value : values) {
auto name_item = new QStandardItem(attribute);
auto value_item = new QStandardItem(value);
name_item->setEditable(false);
appendRow({name_item, value_item});
}
}
}
void AttributesModel::on_entry_deleted(const QString &dn) {
// Clear data if current target was deleted
if (this->target_dn == dn) {
this->change_target(QString(""));
if (target_dn == dn) {
change_target(QString(""));
}
}

21
src/attributes_widget.cpp
View File

@ -29,23 +29,6 @@ AttributesWidget::AttributesWidget()
};
void AttributesWidget::set_target_dn(const QString &new_target_dn) {
this->target_dn = new_target_dn;
// Clear model of previous root
model->change_target(this->target_dn);
// Populate model with attributes of new root
QMap<QString, QList<QString>> attributes = get_attributes(this->target_dn);
for (auto attribute : attributes.keys()) {
QList<QString> values = attributes[attribute];
for (auto value : values) {
auto name_item = new QStandardItem(attribute);
auto value_item = new QStandardItem(value);
name_item->setEditable(false);
model->appendRow({name_item, value_item});
}
}
// Set model to new target
model->change_target(new_target_dn);
}

2
src/attributes_widget.h
View File

@ -15,7 +15,6 @@ Q_OBJECT
public:
AttributesWidget();
public slots:
void set_target_dn(const QString &new_target_dn);
@ -28,7 +27,6 @@ private:
AttributesModel *model = nullptr;
QTreeView *view = nullptr;
QString target_dn;
};
#endif /* ATTRIBUTES_WIDGET_H */

14
src/main_window.cpp
View File

@ -3,21 +3,18 @@
#include "containers_widget.h"
#include "contents_widget.h"
#include "attributes_widget.h"
#include "ad_proxy_model.h"
#include "ad_model.h"
#include "attributes_model.h"
#include "create_entry_dialog.h"
#include <QString>
#include <QAction>
#include <QVariant>
#include <QMainWindow>
#include <QMenu>
#include <QMenuBar>
#include <QSplitter>
#include <QStatusBar>
#include <QTreeView>
#include <QHeaderView>
MainWindow::MainWindow(): QMainWindow() {
//
@ -84,12 +81,13 @@ MainWindow::MainWindow(): QMainWindow() {
// Setup "New X" actions
for (int type_i = NewEntryType::User; type_i < NewEntryType::COUNT; type_i++) {
NewEntryType type = static_cast<NewEntryType>(type_i);
QString label = new_entry_type_to_string[type];
QAction *action = new QAction(label);
QString text = new_entry_type_to_string[type];
QAction *action = new QAction(text, this);
QObject::connect(action, &QAction::triggered, [type]() {
create_entry_dialog(type);
});
QObject::connect(action, &QAction::triggered,
[type] () {
create_entry_dialog(type);
});
new_entry_actions.push_back(action);
menubar_new->addAction(action);