Ticket 37. The message variable definition moved from if() construction

in the ApplyChanges() function.

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
index 841fafa118c54734fe91d396dbc682060955bdb2..ef3a470e5b9ab21d46a339b69fe2b7d4436c13b7 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
@@ -598,7 +598,8 @@ int CHG_USER::ApplyChanges()
         if (newTariff)
         {
             const TARIFF * tariff = u->GetTariff();
-            if (tariff->TariffChangeIsAllowed(*newTariff) == "")
+            std::string message = tariff->TariffChangeIsAllowed(*newTariff);
+            if (message == "")
             {
                 if (!u->GetProperty().tariffName.Set(m_ucr.tariffName.const_data(), &m_currAdmin, m_login, &m_store))
                     return -1;
@@ -606,7 +607,6 @@ int CHG_USER::ApplyChanges()
             }
             else
             {
-                std::string message = tariff->TariffChangeIsAllowed(*newTariff);
                 GetStgLogger()("Tariff change is prohibited for user %s. %s", u->GetLogin().c_str(), message.c_str());
             }
         }