From d41607551a91fe019de4c004c60d3a9107f1cc53 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Wed, 21 Nov 2012 09:37:56 +0000
Subject: [PATCH] Improved logging and logging in
SVN: 27735
---
openbis-ipad/openBIS/openBIS/CISDOBAppDelegate.m | 3 ++-
.../openBIS/openBIS/CISDOBLoginViewController.m | 12 ++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/openbis-ipad/openBIS/openBIS/CISDOBAppDelegate.m b/openbis-ipad/openBIS/openBIS/CISDOBAppDelegate.m
index ed09e9bd7bc..b15a6251af8 100644
--- a/openbis-ipad/openBIS/openBIS/CISDOBAppDelegate.m
+++ b/openbis-ipad/openBIS/openBIS/CISDOBAppDelegate.m
@@ -149,7 +149,7 @@
// to the root model... maybe there is a better way to do this.
[self detailsViewController].openBisModel = self.rootOpenBisModel;
- [self initializeOpenBisConnection];
+// [self initializeOpenBisConnection];
return YES;
@@ -175,6 +175,7 @@
- (void)applicationDidBecomeActive:(UIApplication *)application
{
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+ [self initializeOpenBisConnection];
}
- (void)applicationWillTerminate:(UIApplication *)application
diff --git a/openbis-ipad/openBIS/openBIS/CISDOBLoginViewController.m b/openbis-ipad/openBIS/openBIS/CISDOBLoginViewController.m
index 4cd5a6bc0b9..375a9bb15b0 100644
--- a/openbis-ipad/openBIS/openBIS/CISDOBLoginViewController.m
+++ b/openbis-ipad/openBIS/openBIS/CISDOBLoginViewController.m
@@ -69,6 +69,8 @@
NSString *urlString = [self valueFromTextField: self.urlTextField];
NSURL *openbisUrl = (urlString) ? [NSURL URLWithString: urlString] : nil;
+ [self showStatus: @"Logging in..."];
+
CISDOBAppDelegate *appDelegate = self.appDelegate;
[appDelegate verifyLoginURL: openbisUrl username: username password: password sender: self];
}
@@ -79,5 +81,15 @@
self.errorLabel.text = errorText;
}
+- (void)showStatus:(NSString *)status
+{
+ self.errorLabel.text = status;
+}
+
+- (void)clearStatus
+{
+ self.errorLabel.text = @"";
+}
+
@end
--
GitLab