Skip to content

Add properties to general_computer_tab in main view #459

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
uyraq2001 wants to merge 1 commit into
base: master
Choose a base branch
from
+53 −7
Open

Add properties to general_computer_tab in main view #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions src/admc/console_impls/object_impl/object_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,10 @@ void ObjectImpl::selected_as_scope(const QModelIndex &index)
else if (object.is_class(CLASS_SUBNET)) {
stacked_widget->setCurrentWidget(subnet_results_widget);
subnet_results_widget->update(object);
}
else {
} else if (object.is_class(CLASS_COMPUTER)) {
stacked_widget->setCurrentWidget(computer_results_widget);
computer_results_widget->update(ad, object);
} else {
stacked_widget->setCurrentWidget(view());
}
}
Expand All @@ -509,6 +511,11 @@ void ObjectImpl::update_results_widget(const QModelIndex &index) const {
return;
}

if (object.is_class(CLASS_COMPUTER)) {
computer_results_widget->update(ad, object);
return;
}

if (object.is_class(CLASS_CONTACT) ||
object.is_class(CLASS_USER) ||
object.is_class(CLASS_INET_ORG_PERSON)) {
Expand Down Expand Up @@ -950,9 +957,11 @@ void ObjectImpl::setup_widgets() {
set_results_view(new ResultsView(console));
group_results_widget = new GeneralGroupTab();
user_results_widget = new GeneralUserTab();
computer_results_widget = new GeneralComputerTab();

@Samael-fhts Samael-fhts Jun 17, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think better create separate results widget for that AD object (computer) class.

pso_results_widget = new PSOResultsWidget();
subnet_results_widget = new SubnetResultsWidget();
stacked_widget->addWidget(group_results_widget);
stacked_widget->addWidget(computer_results_widget);
stacked_widget->addWidget(user_results_widget);
stacked_widget->addWidget(pso_results_widget);
stacked_widget->addWidget(subnet_results_widget);
Expand Down
2 changes: 2 additions & 0 deletions src/admc/console_impls/object_impl/object_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include "console_widget/console_impl.h"
#include "console_widget/console_widget.h"
#include "console_object_operations.h"
#include "tabs/general_computer_tab.h"

class QStandardItem;
class AdObject;
Expand Down Expand Up @@ -151,6 +152,7 @@ private slots:
QStackedWidget *stacked_widget;
GeneralGroupTab *group_results_widget;
GeneralUserTab *user_results_widget;
GeneralComputerTab *computer_results_widget;
PSOResultsWidget *pso_results_widget;
SubnetResultsWidget *subnet_results_widget;

Expand Down
35 changes: 30 additions & 5 deletions src/admc/tabs/general_computer_tab.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,33 @@ GeneralComputerTab::GeneralComputerTab(QList<AttributeEdit *> *edit_list, QWidge
ui = new Ui::GeneralComputerTab();
ui->setupUi(this);

edit_list->append(create_edits());
}

GeneralComputerTab::GeneralComputerTab(QWidget *parent)
: QWidget(parent) {
ui = new Ui::GeneralComputerTab();
ui->setupUi(this);

m_edit_list = create_edits();

ui->name_label->setVisible(false);
ui->description_edit->setReadOnly(true);
ui->dns_host_name_edit->setReadOnly(true);
ui->sam_name_domain_edit->setReadOnly(true);
ui->sam_name_edit->setReadOnly(true);
ui->location_edit->setReadOnly(true);
}

void GeneralComputerTab::update(AdInterface &ad, const AdObject &object) {
AttributeEdit::load(m_edit_list, ad, object);
}

GeneralComputerTab::~GeneralComputerTab() {
delete ui;
}

QList<AttributeEdit *> GeneralComputerTab::create_edits() {
auto name_edit = new GeneralNameEdit(ui->name_label, this);
auto sam_name_edit = new ComputerSamNameEdit(ui->sam_name_edit, ui->sam_name_domain_edit, this);
auto dns_edit = new StringEdit(ui->dns_host_name_edit, ATTRIBUTE_DNS_HOST_NAME, this);
Expand All @@ -40,15 +67,13 @@ GeneralComputerTab::GeneralComputerTab(QList<AttributeEdit *> *edit_list, QWidge
sam_name_edit->set_enabled(false);
dns_edit->set_enabled(false);

edit_list->append({
QList<AttributeEdit *> edit_list = {
name_edit,
sam_name_edit,
dns_edit,
description_edit,
location_edit,
});
}
};

GeneralComputerTab::~GeneralComputerTab() {
delete ui;
return edit_list;
}
10 changes: 10 additions & 0 deletions src/admc/tabs/general_computer_tab.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

#include <QWidget>

#include "ad_interface.h"

class AttributeEdit;
class AdObject;

Expand All @@ -37,7 +39,15 @@ class GeneralComputerTab final : public QWidget {
Ui::GeneralComputerTab *ui;

GeneralComputerTab(QList<AttributeEdit *> *edit_list, QWidget *parent);
GeneralComputerTab(QWidget *parent = nullptr);
~GeneralComputerTab();

void update(AdInterface &ad, const AdObject &object);

private:
QList<AttributeEdit *> m_edit_list;

QList<AttributeEdit *> create_edits();
};

#endif /* GENERAL_COMPUTER_TAB_H */