From 1d7195129b99e974b59d901bc5db3e99bf764669 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Thu, 6 Dec 2012 11:55:18 +0100 Subject: [PATCH] Managed roles and resources in authorization. --- src/authorization.c | 187 ++++++++++++++++++++++++++++++++++++++++++-- src/resource.c | 12 +++ src/role.c | 12 +++ tests/db.db | Bin 7168 -> 7168 bytes 4 files changed, 205 insertions(+), 6 deletions(-) diff --git a/src/authorization.c b/src/authorization.c index 5029095..220ef7a 100644 --- a/src/authorization.c +++ b/src/authorization.c @@ -21,6 +21,8 @@ #include #include "authorization.h" +#include "roles.h" +#include "resources.h" static void authorization_class_init (AuthorizationClass *klass); static void authorization_init (Authorization *authorization); @@ -28,6 +30,12 @@ static void authorization_init (Authorization *authorization); static void authorization_load (Authorization *authorization); static void authorization_save (Authorization *authorization); +static void authorization_fill_role (Authorization *authorization); +static void authorization_fill_resource (Authorization *authorization); + +static void authorization_on_role_selected (gpointer instance, guint id, gpointer user_data); +static void authorization_on_resource_selected (gpointer instance, guint id, gpointer user_data); + static void authorization_set_property (GObject *object, guint property_id, const GValue *value, @@ -37,6 +45,11 @@ static void authorization_get_property (GObject *object, GValue *value, GParamSpec *pspec); +static void authorization_on_btn_role_clicked (GtkButton *button, + gpointer user_data); +static void authorization_on_btn_resource_clicked (GtkButton *button, + gpointer user_data); + static void authorization_on_btn_cancel_clicked (GtkButton *button, gpointer user_data); static void authorization_on_btn_save_clicked (GtkButton *button, @@ -118,6 +131,11 @@ Authorization priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_authorization")); + g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button23"), + "clicked", G_CALLBACK (authorization_on_btn_role_clicked), (gpointer *)a); + g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button22"), + "clicked", G_CALLBACK (authorization_on_btn_resource_clicked), (gpointer *)a); + g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button20"), "clicked", G_CALLBACK (authorization_on_btn_cancel_clicked), (gpointer *)a); g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button21"), @@ -130,7 +148,8 @@ Authorization } else { - gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (priv->commons->gtkbuilder, "label12")), g_strdup_printf ("%d", priv->id)); + gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (priv->commons->gtkbuilder, "label12")), + g_strdup_printf ("%d", priv->id)); authorization_load (a); } @@ -177,6 +196,17 @@ authorization_load (Authorization *authorization) gda_value_stringify (gda_data_model_get_value_at (dm, 0, 0, NULL))); gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (priv->commons->gtkbuilder, "label14")), gda_value_stringify (gda_data_model_get_value_at (dm, 1, 0, NULL))); + if (g_value_get_int (gda_data_model_get_value_at (dm, 2, 0, NULL)) == 1) + { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (priv->commons->gtkbuilder, "radiobutton1")), TRUE); + } + else + { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (priv->commons->gtkbuilder, "radiobutton2")), TRUE); + } + + authorization_fill_role (authorization); + authorization_fill_resource (authorization); } else { @@ -202,10 +232,33 @@ authorization_save (Authorization *authorization) GdaDataModel *dm; GtkWidget *dialog; + guint type; + AuthorizationClass *klass = AUTHORIZATION_GET_CLASS (authorization); AuthorizationPrivate *priv = AUTHORIZATION_GET_PRIVATE (authorization); + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (priv->commons->gtkbuilder, "radiobutton1")))) + { + type = 1; + } + else + { + type = 2; + } + + if (strtol (gtk_label_get_text (GTK_LABEL (gtk_builder_get_object (priv->commons->gtkbuilder, "label15"))), NULL, 10) == 0) + { + dialog = gtk_message_dialog_new (GTK_WINDOW (priv->w), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, + GTK_BUTTONS_OK, + "Select the role."); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + return; + } + if (priv->id == 0) { /* find the new id */ @@ -233,21 +286,21 @@ authorization_save (Authorization *authorization) new_id, strtol (gtk_label_get_text (GTK_LABEL (gtk_builder_get_object (priv->commons->gtkbuilder, "label15"))), NULL, 10), strtol (gtk_label_get_text (GTK_LABEL (gtk_builder_get_object (priv->commons->gtkbuilder, "label14"))), NULL, 10), - 0); + type); stmt = gda_sql_parser_parse_string (priv->commons->gdaparser, sql, NULL, NULL); } else { sql = g_strdup_printf ("UPDATE %srules" " SET" - " id_roles = %s," - " id_resources = %s," - " type = %s," + " id_roles = %d," + " id_resources = %d," + " type = %d," " WHERE id = %d", priv->commons->prefix, strtol (gtk_label_get_text (GTK_LABEL (gtk_builder_get_object (priv->commons->gtkbuilder, "label15"))), NULL, 10), strtol (gtk_label_get_text (GTK_LABEL (gtk_builder_get_object (priv->commons->gtkbuilder, "label14"))), NULL, 10), - 0, + type, priv->id); stmt = gda_sql_parser_parse_string (priv->commons->gdaparser, sql, NULL, NULL); } @@ -291,6 +344,90 @@ authorization_save (Authorization *authorization) } } +static void +authorization_fill_role (Authorization *authorization) +{ + GError *error; + gchar *sql; + GdaStatement *stmt; + GdaDataModel *dm; + + AuthorizationPrivate *priv = AUTHORIZATION_GET_PRIVATE (authorization); + + sql = g_strdup_printf ("SELECT role_id" + " FROM %sroles" + " WHERE id = %d", + priv->commons->prefix, + strtol (gtk_label_get_text (GTK_LABEL (gtk_builder_get_object (priv->commons->gtkbuilder, "label15"))), NULL, 10)); + stmt = gda_sql_parser_parse_string (priv->commons->gdaparser, sql, NULL, NULL); + g_free (sql); + dm = gda_connection_statement_execute_select (priv->commons->gdacon, stmt, NULL, &error); + g_object_unref (stmt); + if (dm != NULL && gda_data_model_get_n_rows (dm) == 1) + { + gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (priv->commons->gtkbuilder, "entry5")), + gda_value_stringify (gda_data_model_get_value_at (dm, 0, 0, NULL))); + } + else + { + gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (priv->commons->gtkbuilder, "entry5")), + ""); + } + g_object_unref (dm); +} + +static void +authorization_fill_resource (Authorization *authorization) +{ + GError *error; + gchar *sql; + GdaStatement *stmt; + GdaDataModel *dm; + + AuthorizationPrivate *priv = AUTHORIZATION_GET_PRIVATE (authorization); + + sql = g_strdup_printf ("SELECT resource_id" + " FROM %sresources" + " WHERE id = %d", + priv->commons->prefix, + strtol (gtk_label_get_text (GTK_LABEL (gtk_builder_get_object (priv->commons->gtkbuilder, "label14"))), NULL, 10)); + stmt = gda_sql_parser_parse_string (priv->commons->gdaparser, sql, NULL, NULL); + g_free (sql); + dm = gda_connection_statement_execute_select (priv->commons->gdacon, stmt, NULL, &error); + g_object_unref (stmt); + if (dm != NULL && gda_data_model_get_n_rows (dm) == 1) + { + gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (priv->commons->gtkbuilder, "entry4")), + gda_value_stringify (gda_data_model_get_value_at (dm, 0, 0, NULL))); + } + else + { + gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (priv->commons->gtkbuilder, "entry4")), + ""); + } + g_object_unref (dm); +} + +static void +authorization_on_role_selected (gpointer instance, guint id, gpointer user_data) +{ + Authorization *authorization = AUTHORIZATION (instance); + AuthorizationPrivate *priv = AUTHORIZATION_GET_PRIVATE (authorization); + + gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (priv->commons->gtkbuilder, "label15")), + g_strdup_printf ("%d", id)); +} + +static void +authorization_on_resource_selected (gpointer instance, guint id, gpointer user_data) +{ + Authorization *authorization = AUTHORIZATION (instance); + AuthorizationPrivate *priv = AUTHORIZATION_GET_PRIVATE (authorization); + + gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (priv->commons->gtkbuilder, "label14")), + g_strdup_printf ("%d", id)); +} + static void authorization_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { @@ -320,6 +457,44 @@ authorization_get_property (GObject *object, guint property_id, GValue *value, G } /* CALLBACK */ +static void +authorization_on_btn_role_clicked (GtkButton *button, + gpointer user_data) +{ + GtkWidget *w; + + Authorization *authorization = (Authorization *)user_data; + AuthorizationPrivate *priv = AUTHORIZATION_GET_PRIVATE (authorization); + + Roles *c = roles_new (priv->commons, TRUE); + + g_signal_connect (G_OBJECT (c), "selezionato", + G_CALLBACK (authorization_on_role_selected), user_data); + + w = roles_get_widget (c); + gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w)); + gtk_widget_show (w); +} + +static void +authorization_on_btn_resource_clicked (GtkButton *button, + gpointer user_data) +{ + GtkWidget *w; + + Authorization *authorization = (Authorization *)user_data; + AuthorizationPrivate *priv = AUTHORIZATION_GET_PRIVATE (authorization); + + Resources *c = resources_new (priv->commons, TRUE); + + g_signal_connect (G_OBJECT (c), "selezionato", + G_CALLBACK (authorization_on_resource_selected), user_data); + + w = resources_get_widget (c); + gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w)); + gtk_widget_show (w); +} + static void authorization_on_btn_cancel_clicked (GtkButton *button, gpointer user_data) diff --git a/src/resource.c b/src/resource.c index aa299e1..c2d5820 100644 --- a/src/resource.c +++ b/src/resource.c @@ -201,6 +201,18 @@ resource_save (Resource *resource) ResourcePrivate *priv = RESOURCE_GET_PRIVATE (resource); + if (g_strcmp0 (gtk_entry_get_text (GTK_ENTRY (gtk_builder_get_object (priv->commons->gtkbuilder, "entry2"))), "") == 0) + { + dialog = gtk_message_dialog_new (GTK_WINDOW (priv->w), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, + GTK_BUTTONS_OK, + "Insert the name of the resource."); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + return; + } + if (priv->id == 0) { /* find the new id */ diff --git a/src/role.c b/src/role.c index c391a73..d2716a7 100644 --- a/src/role.c +++ b/src/role.c @@ -202,6 +202,18 @@ role_save (Role *role) RolePrivate *priv = ROLE_GET_PRIVATE (role); + if (g_strcmp0 (gtk_entry_get_text (GTK_ENTRY (gtk_builder_get_object (priv->commons->gtkbuilder, "entry1"))), "") == 0) + { + dialog = gtk_message_dialog_new (GTK_WINDOW (priv->w), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, + GTK_BUTTONS_OK, + "Insert the name of the role."); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + return; + } + if (priv->id == 0) { /* find the new id */ diff --git a/tests/db.db b/tests/db.db index 86a73d21a27a2e51138c94941b5e58828c82b9a7..14be4bff2e825ff6f5aa0761c68ffd115f7666fa 100644 GIT binary patch delta 44 zcmZp$Xt0