Author: fehr
Date: Thu Apr 26 17:55:42 2012
New Revision: 68031
URL: http://svn.opensuse.org/viewcvs/yast?rev=68031&view=rev
Log:
checkin for backup purposes
Removed:
branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiServerFunctions.pm
Modified:
branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp
branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp
branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp
Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp?rev=68031&r1=68030&r2=68031&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp (original)
+++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp Thu Apr 26 17:55:42 2012
@@ -250,7 +250,7 @@
global void SetIetdAuth( string tgt, integer tpg, list<string> incom, string outgo )
{
map m = GetTgt(data,tgt,tpg);
- foreach( string s, incom, ``{m=AddIncoming( m, s );});
+ foreach( string s, incom, {m=AddIncoming( m, s );});
if( !isempty(outgo) )
m = AddOutgoing( m, outgo );
SetTgt(data,tgt,tpg,m);
Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp?rev=68031&r1=68030&r2=68031&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp (original)
+++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp Thu Apr 26 17:55:42 2012
@@ -223,13 +223,6 @@
"services" : [ "service:iscsitarget" ],
"display_details" : true,
]),
- "save" : $[
- "widget" : `push_button,
- "label" : Label::SaveButton(),
- "handle" : saveConfiguration,
- "opt": [],
- "help": HELPS["save_configuration"]:""
- ],
"isns" : $[
"widget" : `custom,
"custom_widget" :
Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp?rev=68031&r1=68030&r2=68031&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp (original)
+++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp Thu Apr 26 17:55:42 2012
@@ -24,7 +24,6 @@
{
textdomain "iscsi-lio-server";
-import "IscsiServerFunctions";
import "IscsiLioData";
import "Label";
import "Event";
@@ -638,30 +637,6 @@
}
-symbol saveConfiguration(string key, map event)
- {
- y2milestone( "saveConfiguration key:%1 event:%2", key, event );
- if( is(event["ID"]:nil, string) && event["ID"]:"" == "save")
- {
- any filename = UI::AskForSaveFileName("/", "*", _("Save as..."));
- if ( filename != nil && (string)filename!="")
- {
- if( IscsiServerFunctions::SaveIntoFile( (string)filename ))
- {
- Popup::Message(sformat(_("File %1 was saved successfully."), filename));
- list pathComponents = splitstring( (string)filename, "/");
- integer s = size(pathComponents) - 1;
- string base = pathComponents[s]:"default";
- }
- else
- {
- Popup::Warning(_("An error occurred while saving the file."));
- }
- }
- }
- return nil;
- }
-
list<term> RemoveById( list<term> it, any id )
{
y2milestone( "RemoveById id:%1 item:%2", id, filter( term i, it, ``(i[0,0]:(any)99==id)) );
@@ -679,7 +654,7 @@
// dialog with targets
// initialize target dialog
-void initTable (string key) ``{
+void initTable (string key) {
integer count = 0;
list <term> inc_items = [];
// create items from targets
@@ -750,13 +725,9 @@
return ret;
}
-void initiSNS (string key) ``{
+void initiSNS (string key) {
boolean ac=false;
string ip = "";
-foreach(map row, IscsiServerFunctions::getConfig()["iSNS"]:[], {
- if(row["KEY"]:""=="iSNSAccessControl") ac=(row["VALUE"]:"No"=="Yes") ? true : false;
- if(row["KEY"]:""=="iSNSServer") ip=row["VALUE"]:"";
-});
UI::ChangeWidget(`isns_ac, `Value, ac);
UI::ChangeWidget(`isns_ip, `Value, ip);
}
@@ -778,7 +749,6 @@
}
string ac=((boolean)UI::QueryWidget(`isns_ac, `Value))?"Yes":"No";
if (ip=="") ac="";
- IscsiServerFunctions::setiSNS(ip, ac);
}
// **************** Edit Dialog *****************************
@@ -1242,7 +1212,7 @@
boolean chg = false;
list<string> cl = IscsiLioData::GetClntList( curr_target, curr_tpg );
foreach( string c, del_clnt,
- ``{
+ {
if( contains( cl, c ))
{
chg = true;
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
fehr＠svn2.opensuse.org